This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 8243edc6f fixbug/pg script error (#3355)
8243edc6f is described below
commit 8243edc6f2867d67165350823797e9eb034f6dee
Author: likeguo <[email protected]>
AuthorDate: Thu Apr 28 01:23:27 2022 +0800
fixbug/pg script error (#3355)
---
script/2.4.2-upgrade-2.4.3-pg.sql | 92 +++++++++++++++++++--------------------
script/2.4.3-upgrade-2.5.0-pg.sql | 18 ++++----
2 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/script/2.4.2-upgrade-2.4.3-pg.sql
b/script/2.4.2-upgrade-2.4.3-pg.sql
index b22b076d2..91a129cb3 100644
--- a/script/2.4.2-upgrade-2.4.3-pg.sql
+++ b/script/2.4.2-upgrade-2.4.3-pg.sql
@@ -21,82 +21,82 @@ UPDATE dashboard_user SET
password='ba3253876aed6bc22d4a6ff53d8406c6ad864195ed14
-- Note: it doesn't matter if you don't execute this SQL, the default
configuration will be compatible with the old version
-- Note: because most users have changed ZK configuration, this SQL is
annotated to prevent erroneous execution
--- UPDATE plugin SET
config='{"register":"zookeeper://localhost:2181","multiSelectorHandle":"1","threadpool":"cached","corethreads":0,"threads":2147483647,"queues":0}'
WHERE `name` = 'dubbo';
+-- UPDATE plugin SET
config='{"register":"zookeeper://localhost:2181","multiSelectorHandle":"1","threadpool":"cached","corethreads":0,"threads":2147483647,"queues":0}'
WHERE "name" = 'dubbo';
-- ^^^^^^^^^ if you want to
execute this SQL, please replace it with your ZK configuration
-- insert plugin_handle data for dubbo
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1509837592619499565', '6',
'threadpool', 'threadpool', '3', '3', '0',
'{"required":"0","defaultValue":"cached","placeholder":"threadpool","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1509837592619499566','6',
'corethreads', 'corethreads', '1', '3', '0',
'{"required":"0","defaultValue":"0","placeholder":"corethreads","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1509837592619499567', '6',
'threads', 'threads', '1', '3', '0',
'{"required":"0","defaultValue":"2147483647","placeholder":"threads","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1509837592619499568', '6',
'queues', 'queues', '1', '3', '0',
'{"required":"0","defaultValue":"0","placeholder":"queues","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1509837592619499565', '6', 'threadpool',
'threadpool', '3', '3', '0',
'{"required":"0","defaultValue":"cached","placeholder":"threadpool","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1509837592619499566','6', 'corethreads',
'corethreads', '1', '3', '0',
'{"required":"0","defaultValue":"0","placeholder":"corethreads","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1509837592619499567', '6', 'threads',
'threads', '1', '3', '0',
'{"required":"0","defaultValue":"2147483647","placeholder":"threads","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1509837592619499568', '6', 'queues',
'queues', '1', '3', '0',
'{"required":"0","defaultValue":"0","placeholder":"queues","rule":""}');
-- insert dict for dubbo plugin
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1509837592611110924',
'threadpool', 'THREADPOOL', 'shared', 'shared', '', '4', '1');
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1509837592611110925',
'threadpool', 'THREADPOOL', 'fixed', 'fixed', '', '3', '1');
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1509837592611110926',
'threadpool', 'THREADPOOL', 'eager', 'eager', '', '2', '1');
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1509837592611110927',
'threadpool', 'THREADPOOL', 'cached', 'cached', '', '0', '1');
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1509837592611110928',
'threadpool', 'THREADPOOL', 'limited', 'limited', '', '1', '1');
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1509837592611110924', 'threadpool',
'THREADPOOL', 'shared', 'shared', '', '4', '1');
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1509837592611110925', 'threadpool',
'THREADPOOL', 'fixed', 'fixed', '', '3', '1');
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1509837592611110926', 'threadpool',
'THREADPOOL', 'eager', 'eager', '', '2', '1');
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1509837592611110927', 'threadpool',
'THREADPOOL', 'cached', 'cached', '', '0', '1');
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1509837592611110928', 'threadpool',
'THREADPOOL', 'limited', 'limited', '', '1', '1');
-- remove monitor plugin
-DELETE FROM plugin WHERE `id` = '7';
-DELETE FROM plugin_handle WHERE `plugin_id` = '7';
+DELETE FROM plugin WHERE "id" = '7';
+DELETE FROM plugin_handle WHERE "plugin_id" = '7';
-- remove plugin_handle shenyu_dict trigger
-DROP TRIGGER IF EXISTS `plugin_handle_check_insert` ON plugin_handle;
-DROP TRIGGER IF EXISTS `shenyu_dict_check_insert` ON shenyu_dict;
+DROP TRIGGER IF EXISTS "plugin_handle_check_insert" ON plugin_handle;
+DROP TRIGGER IF EXISTS "shenyu_dict_check_insert" ON shenyu_dict;
-- insert plugin_handle data for divide
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1509837592619499520', '5',
'retryStrategy', 'retryStrategy', '3', '2', '0',
'{"required":"0","defaultValue":"current","placeholder":"retryStrategy","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1509837592619499520', '5', 'retryStrategy',
'retryStrategy', '3', '2', '0',
'{"required":"0","defaultValue":"current","placeholder":"retryStrategy","rule":""}');
-- insert dict for divide plugin
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1509837592611110929',
'retryStrategy', 'RETRY_STRATEGY', 'current', 'current', 'current', '0', '1');
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1509837592611110930',
'retryStrategy', 'RETRY_STRATEGY', 'failover', 'failover', 'failover', '1',
'1');
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1509837592611110929', 'retryStrategy',
'RETRY_STRATEGY', 'current', 'current', 'current', '0', '1');
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1509837592611110930', 'retryStrategy',
'RETRY_STRATEGY', 'failover', 'failover', 'failover', '1', '1');
/* insert dict for compress algorithm */
-INSERT IGNORE INTO `shenyu_dict` (`id`, `type`,`dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1509837592611110932',
'compressAlg', 'COMPRESS_ALG', 'none', 'none', '', 0, 1);
-INSERT IGNORE INTO `shenyu_dict` (`id`, `type`,`dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1509837592611110933',
'compressAlg', 'COMPRESS_ALG', 'LZ4', 'LZ4', '', 1, 1);
+INSERT INTO "shenyu_dict" ("id", "type","dict_code", "dict_name",
"dict_value", "desc", "sort", "enabled") VALUES ('1509837592611110932',
'compressAlg', 'COMPRESS_ALG', 'none', 'none', '', 0, 1);
+INSERT INTO "shenyu_dict" ("id", "type","dict_code", "dict_name",
"dict_value", "desc", "sort", "enabled") VALUES ('1509837592611110933',
'compressAlg', 'COMPRESS_ALG', 'LZ4', 'LZ4', '', 1, 1);
/* insert plugin for loggingRocketMQ */
-INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,
`enabled`, `date_created`, `date_updated`) VALUES ('29', 'loggingRocketMQ',
'Logging', 170,'{"topic":"shenyu-access-logging", "namesrvAddr":
"localhost:9876","producerGroup":"shenyu-plugin-logging-rocketmq"}', '0',
'2022-03-19 09:00:00', '2022-03-19 09:00:00');
+INSERT INTO "plugin" ("id", "name", "role", "sort", "config", "enabled",
"date_created", "date_updated") VALUES ('29', 'loggingRocketMQ', 'Logging',
170,'{"topic":"shenyu-access-logging", "namesrvAddr":
"localhost:9876","producerGroup":"shenyu-plugin-logging-rocketmq"}', '0',
'2022-03-19 09:00:00', '2022-03-19 09:00:00');
/*insert plugin_handle data for plugin loggingRocketMQ*/
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1509837592623693841', '29', 'topic', 'topic', 2, 3, 1,
'{"required":"1","defaultValue":"shenyu-access-logging"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1509837592623693842', '29', 'namesrvAddr', 'namesrvAddr', 2, 3, 2,
'{"required":"1","defaultValue":"localhost:9876"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1509837592623693843', '29', 'producerGroup', 'producerGroup', 2, 3, 3,
'{"required":"1","defaultValue":"shenyu-plugin-logging-rocketmq"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1509837592623693844', '29', 'sampleRate', 'sampleRate', 2, 3, 4,
'{"required":"0","defaultValue":"1","placeholder":"optional,0,0.01~1"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1509837592623693845', '29', 'maxResponseBody', 'maxResponseBody', 1, 3, 5,
'{"required":"0","defaultValue":524288}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1509837592623693846', '29', 'maxRequestBody', 'maxRequestBody', 1, 3, 6,
'{"required":"0","defaultValue":524288}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1509837592623693847', '29', 'compressAlg', 'compressAlg', 3, 3, 7,
'{"required":"0","defaultValue":"none"}');
-
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1509837592623693848', '29', 'topic', 'topic', 2, 1, 1,
'{"required":"0","defaultValue":"","placeholder":"optional"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1509837592623693849', '29', 'sampleRate', 'sampleRate', 2, 1, 2,
'{"required":"0","defaultValue":"","placeholder":"optional,0,0.01~1"}');
+INSERT INTO plugin_handle ("id",
"plugin_id","field","label","data_type","type","sort","ext_obj") VALUES
('1509837592623693841', '29', 'topic', 'topic', 2, 3, 1,
'{"required":"1","defaultValue":"shenyu-access-logging"}');
+INSERT INTO plugin_handle ("id",
"plugin_id","field","label","data_type","type","sort","ext_obj") VALUES
('1509837592623693842', '29', 'namesrvAddr', 'namesrvAddr', 2, 3, 2,
'{"required":"1","defaultValue":"localhost:9876"}');
+INSERT INTO plugin_handle ("id",
"plugin_id","field","label","data_type","type","sort","ext_obj") VALUES
('1509837592623693843', '29', 'producerGroup', 'producerGroup', 2, 3, 3,
'{"required":"1","defaultValue":"shenyu-plugin-logging-rocketmq"}');
+INSERT INTO plugin_handle ("id",
"plugin_id","field","label","data_type","type","sort","ext_obj") VALUES
('1509837592623693844', '29', 'sampleRate', 'sampleRate', 2, 3, 4,
'{"required":"0","defaultValue":"1","placeholder":"optional,0,0.01~1"}');
+INSERT INTO plugin_handle ("id",
"plugin_id","field","label","data_type","type","sort","ext_obj") VALUES
('1509837592623693845', '29', 'maxResponseBody', 'maxResponseBody', 1, 3, 5,
'{"required":"0","defaultValue":524288}');
+INSERT INTO plugin_handle ("id",
"plugin_id","field","label","data_type","type","sort","ext_obj") VALUES
('1509837592623693846', '29', 'maxRequestBody', 'maxRequestBody', 1, 3, 6,
'{"required":"0","defaultValue":524288}');
+INSERT INTO plugin_handle ("id",
"plugin_id","field","label","data_type","type","sort","ext_obj") VALUES
('1509837592623693847', '29', 'compressAlg', 'compressAlg', 3, 3, 7,
'{"required":"0","defaultValue":"none"}');
+
+INSERT INTO plugin_handle ("id",
"plugin_id","field","label","data_type","type","sort","ext_obj") VALUES
('1509837592623693848', '29', 'topic', 'topic', 2, 1, 1,
'{"required":"0","defaultValue":"","placeholder":"optional"}');
+INSERT INTO plugin_handle ("id",
"plugin_id","field","label","data_type","type","sort","ext_obj") VALUES
('1509837592623693849', '29', 'sampleRate', 'sampleRate', 2, 1, 2,
'{"required":"0","defaultValue":"","placeholder":"optional,0,0.01~1"}');
-- Note: it doesn't matter if you don't execute this SQL, the default
configuration will be compatible with the old version
-- Note: because users may have changed configuration, this SQL is annotated
to prevent erroneous execution
--- UPDATE plugin SET
config='{"multiSelectorHandle":"1","multiRuleHandle":"0","threadpool":"cached"}'
WHERE `name` = 'grpc';
+-- UPDATE plugin SET
config='{"multiSelectorHandle":"1","multiRuleHandle":"0","threadpool":"cached"}'
WHERE "name" = 'grpc';
-- if you want to execute this SQL, please replace these with your own
configuration
-- insert plugin_handle data for grpc
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1509843898293887014', '15',
'threadpool', 'threadpool', '3', '3', '0',
'{"required":"0","defaultValue":"cached","placeholder":"threadpool","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1509843898293887014', '15', 'threadpool',
'threadpool', '3', '3', '0',
'{"required":"0","defaultValue":"cached","placeholder":"threadpool","rule":""}');
-- update dict flag
UPDATE shenyu_dict SET dict_value = 'false' WHERE dict_code = 'INIT_FLAG';
-- insert plugin data for cache
-INSERT IGNORE INTO `plugin` (`id`, `name`, `config`, `role`, `sort`,
`enabled`) VALUES ('30', 'cache', '{"cacheType":"memory"}', 'Cache', 10, 0);
+INSERT INTO "plugin" ("id", "name", "config", "role", "sort", "enabled")
VALUES ('30', 'cache', '{"cacheType":"memory"}', 'Cache', 10, 0);
-- insert plugin_handle data for cache
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505397799121616896', '30',
'cacheType', 'cacheType', 3, 3, 1,
'{"required":"1","defaultValue":"memory","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505398085349310464', '30',
'database', 'database', 1, 3, 2,
'{"required":"0","defaultValue":"0","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505398320372940800', '30',
'master', 'master', 2, 3, 3, '{"required":"0","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505398496462405632', '30',
'mode', 'mode', 2, 3, 4,
'{"required":"0","defaultValue":"standalone","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505398640738074624', '30',
'url', 'url', 2, 3, 5, '{"required":"0","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505398799370846208', '30',
'password', 'password', 2, 3, 6, '{"required":"0","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505399120822304768', '30',
'maxIdle', 'maxIdle', 1, 3, 7, '{"required":"0","defaultValue":"8","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505399444706459648', '30',
'minIdle', 'minIdle', 1, 3, 8, '{"required":"0","defaultValue":"0","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505399837066821632', '30',
'maxActive', 'maxActive', 1, 3, 9,
'{"required":"0","defaultValue":"8","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1505400882341904384', '30',
'maxWait', 'maxWait', 3, 3, 10,
'{"required":"0","defaultValue":"-1","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1508820967919169536', '30',
'timeoutSeconds', 'timeoutSeconds', 1, 2, 0,
'{"required":"0","defaultValue":"60","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505397799121616896', '30', 'cacheType',
'cacheType', 3, 3, 1, '{"required":"1","defaultValue":"memory","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505398085349310464', '30', 'database',
'database', 1, 3, 2, '{"required":"0","defaultValue":"0","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505398320372940800', '30', 'master',
'master', 2, 3, 3, '{"required":"0","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505398496462405632', '30', 'mode', 'mode',
2, 3, 4, '{"required":"0","defaultValue":"standalone","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505398640738074624', '30', 'url', 'url',
2, 3, 5, '{"required":"0","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505398799370846208', '30', 'password',
'password', 2, 3, 6, '{"required":"0","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505399120822304768', '30', 'maxIdle',
'maxIdle', 1, 3, 7, '{"required":"0","defaultValue":"8","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505399444706459648', '30', 'minIdle',
'minIdle', 1, 3, 8, '{"required":"0","defaultValue":"0","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505399837066821632', '30', 'maxActive',
'maxActive', 1, 3, 9, '{"required":"0","defaultValue":"8","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1505400882341904384', '30', 'maxWait',
'maxWait', 3, 3, 10, '{"required":"0","defaultValue":"-1","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1508820967919169536', '30',
'timeoutSeconds', 'timeoutSeconds', 1, 2, 0,
'{"required":"0","defaultValue":"60","rule":""}');
-- insert dict for cacheType
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1508821695466483712',
'cacheType', 'CACHE_TYPE_MEMORY', 'memory', 'memory', 'use memory to cache
data', 0, 1);
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1508821813744058368'
,'cacheType', 'CACHE_TYPE_REDIS', 'redis', 'redis', 'use redis to cache data',
1, 1);
\ No newline at end of file
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1508821695466483712', 'cacheType',
'CACHE_TYPE_MEMORY', 'memory', 'memory', 'use memory to cache data', 0, 1);
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1508821813744058368' ,'cacheType',
'CACHE_TYPE_REDIS', 'redis', 'redis', 'use redis to cache data', 1, 1);
diff --git a/script/2.4.3-upgrade-2.5.0-pg.sql
b/script/2.4.3-upgrade-2.5.0-pg.sql
index d2d19ddc9..14eb23462 100644
--- a/script/2.4.3-upgrade-2.5.0-pg.sql
+++ b/script/2.4.3-upgrade-2.5.0-pg.sql
@@ -18,23 +18,23 @@
-- Note: it doesn't matter if you don't execute this SQL
-- Note: because most users have changed ZK configuration, this SQL is
annotated to prevent erroneous execution
--- UPDATE plugin SET
config='{"register":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0}'
WHERE `name` = 'motan';
+-- UPDATE plugin SET
config='{"register":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0}'
WHERE "name" = 'motan';
-- if you want to execute this SQL, please replace it with your ZK
configuration
-- insert plugin_handle data for motan
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1510270286164094976', '17',
'corethreads', 'corethreads', 1, 3, 0,
'{"required":"0","defaultValue":"0","placeholder":"corethreads","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1510270476329644032', '17',
'threads', 'threads', 1, 3, 0,
'{"required":"0","defaultValue":"2147483647","placeholder":"threads","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1510270555383885824', '17',
'queues', 'queues', 1, 3, 0,
'{"required":"0","defaultValue":"0","placeholder":"queues","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`, `field`, `label`,
`data_type`, `type`, `sort`, `ext_obj`) VALUES ('1515116191850078208', '17',
'threadpool', 'threadpool', 3, 3, 0,
'{"required":"0","defaultValue":"cached","placeholder":"threadpool","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1510270286164094976', '17', 'corethreads',
'corethreads', 1, 3, 0,
'{"required":"0","defaultValue":"0","placeholder":"corethreads","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1510270476329644032', '17', 'threads',
'threads', 1, 3, 0,
'{"required":"0","defaultValue":"2147483647","placeholder":"threads","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1510270555383885824', '17', 'queues',
'queues', 1, 3, 0,
'{"required":"0","defaultValue":"0","placeholder":"queues","rule":""}');
+INSERT INTO plugin_handle ("id", "plugin_id", "field", "label", "data_type",
"type", "sort", "ext_obj") VALUES ('1515116191850078208', '17', 'threadpool',
'threadpool', 3, 3, 0,
'{"required":"0","defaultValue":"cached","placeholder":"threadpool","rule":""}');
-- Note: it doesn't matter if you don't execute this SQL
-- Note: because most users have changed ZK configuration, this SQL is
annotated to prevent erroneous execution
--- UPDATE plugin SET
config='{"register":"zookeeper://localhost:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"cached"}'
WHERE `name` = 'motan';
+-- UPDATE plugin SET
config='{"register":"zookeeper://localhost:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"cached"}'
WHERE "name" = 'motan';
-- ^^^^^^^^^^^^^^ if you
want to execute this SQL, please replace it with your own ZK configuration
-- insert dict for all plugin
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1516043399649357824',
'operator', 'OPERATOR', 'startsWith', 'startsWith', 'startsWith', 7, 1);
-INSERT IGNORE INTO shenyu_dict (`id`, `type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('1516043495265869824',
'operator', 'OPERATOR', 'endsWith', 'endsWith', 'endsWith', 8, 1);
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1516043399649357824', 'operator',
'OPERATOR', 'startsWith', 'startsWith', 'startsWith', 7, 1);
+INSERT INTO shenyu_dict ("id", "type", "dict_code", "dict_name", "dict_value",
"desc", "sort", "enabled") VALUES ('1516043495265869824', 'operator',
'OPERATOR', 'endsWith', 'endsWith', 'endsWith', 8, 1);
-- refactor logging name
-UPDATE plugin SET name = 'LoggingConsole' WHERE name = 'logging';
\ No newline at end of file
+UPDATE plugin SET name = 'LoggingConsole' WHERE name = 'logging';
