This is an automated email from the ASF dual-hosted git repository.

hefengen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new 062fe49e94 Fix upgrade 2.6.0 sql (#5037)
062fe49e94 is described below

commit 062fe49e9449aacc27b94032c961989a790aa863
Author: 杨文杰 <[email protected]>
AuthorDate: Thu Aug 17 22:07:37 2023 +0800

    Fix upgrade 2.6.0 sql (#5037)
    
    * fix sql
    
    * fix sql
    
    ---------
    
    Co-authored-by: moremind <[email protected]>
---
 db/init/mysql/schema.sql                 | 2 +-
 db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql | 1 +
 db/upgrade/2.5.1-upgrade-2.6.0-pg.sql    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index f0f2db8b9e..57a9c85dc5 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -1150,7 +1150,7 @@ INSERT INTO `plugin_handle` VALUES 
('1676477594361032705', '43', 'keyword', 'key
 INSERT INTO `plugin_handle` VALUES ('1676477594361032706', '43', 'maskType', 
'maskType', 3, 2, 1, 
'{\"required\":\"0\",\"defaultValue\":\"dataMaskByMD5\",\"rule\":\"\"}', 
'2023-07-05 14:26:20.600', '2023-07-07 22:50:00.620');
 INSERT INTO `plugin_handle` VALUES ('1676477594361032707', '43', 'maskStatus', 
'maskStatus', 3, 2, 2, 
'{\"required\":\"0\",\"defaultValue\":\"false\",\"rule\":\"\"}','2023-07-05 
14:26:20.600', '2023-07-07 22:50:00.620');
 
-
+INSERT INTO `plugin_handle` VALUES ('1678997037438107647', '42', 
'discoveryHandler', 'discoveryHandler', 2, 1, 0, 
'{"required":"0","defaultValue":"url,protocol,status,weight","rule":""}', 
'2023-07-10 14:41:27', '2023-08-17 16:58:25.259000000');
 INSERT INTO `plugin_handle` VALUES ('1678997037438107648', '42', 
'bossGroupThreadCount', 'bossGroupThreadCount', 2, 1, 1, 
'{\"required\":\"0\",\"defaultValue\":\"1\",\"rule\":\"\"}', '2023-01-10 
10:08:01.158', '2023-01-10 10:08:01.158');
 INSERT INTO `plugin_handle` VALUES ('1678997142656417792', '42', 
'workerGroupThreadCount', 'workerGroupThreadCount', 2, 1, 2, 
'{\"required\":\"0\",\"defaultValue\":\"12\",\"rule\":\"\"}', '2023-01-10 
10:08:01.158', '2023-01-10 10:08:01.158');
 INSERT INTO `plugin_handle` VALUES ('1678997399104552960', '42', 
'clientMaxIdleTimeMs', 'clientMaxIdleTimeMs', 2, 1, 7, 
'{\"required\":\"0\",\"defaultValue\":\"30000\",\"rule\":\"\"}', '2023-01-10 
10:08:01.158', '2023-01-10 10:08:01.158');
diff --git a/db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql 
b/db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql
index fd9b322c15..2fc7e6cb62 100644
--- a/db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql
+++ b/db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql
@@ -160,6 +160,7 @@ ALTER TABLE shenyu_dict MODIFY COLUMN dict_value 
varchar(2048) CHARACTER SET utf
 
 INSERT INTO `shenyu_dict` VALUES ('1679002911061737472', 'discoveryMode', 
'DISCOVERY_MODE', 'zookeeper', 
'{"baseSleepTimeMilliseconds":"1000","maxRetries":"3","maxSleepTimeMilliseconds":"1000","connectionTimeoutMilliseconds":"1000","sessionTimeoutMilliseconds":"1000","namespace":"","digest":null}',
 'discoery mode to link zookeeper', 0, 1,'2023-03-01 10:48:49', '2023-03-01 
10:48:49');
 
+INSERT INTO `plugin_handle` VALUES ('1678997037438107647', '42', 
'discoveryHandler', 'discoveryHandler', 2, 1, 0, 
'{"required":"0","defaultValue":"url,protocol,status,weight","rule":""}', 
'2023-07-10 14:41:27', '2023-08-17 16:58:25.259000000');
 INSERT INTO `plugin_handle` VALUES ('1678997037438107648', '42', 
'bossGroupThreadCount', 'bossGroupThreadCount', 2, 1, 1, 
'{\"required\":\"0\",\"defaultValue\":\"1\",\"rule\":\"\"}', '2023-01-10 
10:08:01.158', '2023-01-10 10:08:01.158');
 INSERT INTO `plugin_handle` VALUES ('1678997142656417792', '42', 
'workerGroupThreadCount', 'workerGroupThreadCount', 2, 1, 2, 
'{\"required\":\"0\",\"defaultValue\":\"12\",\"rule\":\"\"}', '2023-01-10 
10:08:01.158', '2023-01-10 10:08:01.158');
 INSERT INTO `plugin_handle` VALUES ('1678997399104552960', '42', 
'clientMaxIdleTimeMs', 'clientMaxIdleTimeMs', 2, 1, 7, 
'{\"required\":\"0\",\"defaultValue\":\"30000\",\"rule\":\"\"}', '2023-01-10 
10:08:01.158', '2023-01-10 10:08:01.158');
diff --git a/db/upgrade/2.5.1-upgrade-2.6.0-pg.sql 
b/db/upgrade/2.5.1-upgrade-2.6.0-pg.sql
index 97adba37d2..0ce68ae5b5 100644
--- a/db/upgrade/2.5.1-upgrade-2.6.0-pg.sql
+++ b/db/upgrade/2.5.1-upgrade-2.6.0-pg.sql
@@ -201,7 +201,7 @@ INSERT INTO "public"."plugin_handle"
 VALUES('1678293231840038912', '42', 'discoveryZookeeper', 'discovery zk init 
props', 2, 3, 0, 
'{"required":"0","defaultValue":"{\"baseSleepTimeMilliseconds\":\"1000\",\"maxRetries\":\"3\",\"maxSleepTimeMilliseconds\":\"1000\",\"connectionTimeoutMilliseconds\":\"1000\",\"sessionTimeoutMilliseconds\":\"1000\",\"namespace\":\"\",\"digest\":null}","rule":""}',
 '2023-07-10 14:41:02.000', '2023-07-10 14:41:40.643');
 INSERT INTO "public"."plugin_handle"
 (id, plugin_id, field, "label", data_type, "type", sort, ext_obj, 
date_created, date_updated)
-VALUES('1678293333363167232', '42', 'discoveryhandler', 'discoveryhandler', 2, 
1, 0, '{"required":"0","defaultValue":"url,protocol,status,weight","rule":""}', 
'2023-07-10 14:41:27.000', '2023-07-12 13:16:55.067');
+VALUES('1678293333363167232', '42', 'discoveryHandler', 'discoveryHandler', 2, 
1, 0, '{"required":"0","defaultValue":"url,protocol,status,weight","rule":""}', 
'2023-07-10 14:41:27.000', '2023-07-12 13:16:55.067');
 INSERT INTO "public"."plugin_handle"
 (id, plugin_id, field, "label", data_type, "type", sort, ext_obj, 
date_created, date_updated)
 VALUES('1678997037438107648', '42', 'bossGroupThreadCount', 
'bossGroupThreadCount', 2, 1, 1, 
'{"required":"0","defaultValue":"1","rule":""}', '2023-07-12 13:17:43.000', 
'2023-07-12 13:22:24.662');

Reply via email to