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/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 3557781bea [fix] fix upgrade sql bug (#5963)
3557781bea is described below
commit 3557781bea79fd40be8bab2d918ca2d2a4da2f4a
Author: aias00 <[email protected]>
AuthorDate: Tue Mar 18 17:08:55 2025 +0800
[fix] fix upgrade sql bug (#5963)
---
db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql | 4 ++--
db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql | 4 ++--
db/upgrade/2.5.1-upgrade-2.6.0-pg.sql | 8 ++++----
db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql | 16 ++++++++--------
db/upgrade/2.6.1-upgrade-2.7.0-og.sql | 16 ++++++++--------
db/upgrade/2.6.1-upgrade-2.7.0-oracle.sql | 16 ++++++++--------
db/upgrade/2.6.1-upgrade-2.7.0-pg.sql | 16 ++++++++--------
7 files changed, 40 insertions(+), 40 deletions(-)
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 af8e5facba..9f6b632de5 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
@@ -16,11 +16,11 @@
-- this file works for MySQL.
-ALTER TABLE selector ADD COLUMN match_restful TINYINT(0) NOT NULL
+ALTER TABLE selector ADD COLUMN match_restful TINYINT(0) NOT NULL default 0
COMMENT 'whether to match restful(0 cache, 1 not cache)';
COMMIT;
-ALTER TABLE rule ADD COLUMN match_restful TINYINT(0) NOT NULL
+ALTER TABLE rule ADD COLUMN match_restful TINYINT(0) NOT NULL default 0
COMMENT 'whether to match restful(0 cache, 1 not cache)';
COMMIT;
diff --git a/db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql
b/db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql
index eb2b5710ae..6ecbb628f9 100644
--- a/db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql
+++ b/db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql
@@ -16,11 +16,11 @@
-- this file works for Oracle, can not use "`" syntax.
-ALTER TABLE selector ADD match_restful NUMBER(3) not null;
+ALTER TABLE selector ADD match_restful NUMBER(3) NOT NULL DEFAULT 0;
COMMENT ON COLUMN SELECTOR.match_restful IS 'whether to match restful(0 cache,
1 not cache)';
COMMIT;
-ALTER TABLE rule ADD match_restful NUMBER(3) not null;
+ALTER TABLE rule ADD match_restful NUMBER(3) NOT NULL DEFAULT 0;
COMMENT ON COLUMN RULE.match_restful IS 'whether to match restful(0 cache, 1
not cache)';
COMMIT;
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 2d556f5321..5c3c705cfb 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
@@ -16,11 +16,11 @@
-- this file works for PostgreSQL, can not use "`" syntax.
-ALTER TABLE selector ADD COLUMN match_restful int2 NOT NULL;
+ALTER TABLE selector ADD COLUMN match_restful int2 NOT NULL DEFAULT 0;
COMMENT ON COLUMN "public"."selector"."match_restful" IS 'whether to match
restful(0 cache, 1 not cache)';
COMMIT;
-ALTER TABLE rule ADD COLUMN match_restful int2 NOT NULL;
+ALTER TABLE rule ADD COLUMN match_restful int2 NOT NULL DEFAULT 0;
COMMENT ON COLUMN "public"."rule"."match_restful" IS 'whether to match
restful(0 cache, 1 not cache)';
COMMIT;
@@ -127,8 +127,8 @@ CREATE TABLE "public"."discovery_upstream"
"discovery_handler_id" varchar(128) COLLATE "pg_catalog"."default" NOT
NULL,
"protocol" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"url" varchar(128) COLLATE "pg_catalog"."default",
- "status" int2 COLLATE "pg_catalog"."default" NOT NULL,
- "weight" int2 COLLATE "pg_catalog"."default" NOT NULL,
+ "status" int2 NOT NULL,
+ "weight" int2 NOT NULL,
"props" text COLLATE "pg_catalog"."default",
"date_created" timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"date_updated" timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP
diff --git a/db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql
b/db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql
index e498be86a7..2d89c19ac3 100755
--- a/db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql
+++ b/db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql
@@ -144,21 +144,21 @@ INSERT INTO `resource` (`id`, `parent_id`, `title`,
`name`, `url`, `component`,
ALTER TABLE `dashboard_user` ADD COLUMN `client_id` varchar(32) NULL DEFAULT
NULL COMMENT 'client id';
-ALTER TABLE `selector` ADD COLUMN `namespace_id` varchar(50) NOT NULL COMMENT
'namespaceId' AFTER `match_restful`;
+ALTER TABLE `selector` ADD COLUMN `namespace_id` varchar(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385' COMMENT 'namespaceId' AFTER
`match_restful`;
-ALTER TABLE `rule` ADD COLUMN `namespace_id` varchar(50) NOT NULL COMMENT
'namespaceId' AFTER `match_restful`;
+ALTER TABLE `rule` ADD COLUMN `namespace_id` varchar(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385' COMMENT 'namespaceId' AFTER
`match_restful`;
-ALTER TABLE `meta_data` ADD COLUMN `namespace_id` varchar(50) NOT NULL COMMENT
'namespaceId' AFTER `rpc_ext`;
+ALTER TABLE `meta_data` ADD COLUMN `namespace_id` varchar(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385' COMMENT 'namespaceId' AFTER `rpc_ext`;
-ALTER TABLE `app_auth` ADD COLUMN `namespace_id` varchar(50) NOT NULL COMMENT
'namespaceId' AFTER `enabled`;
+ALTER TABLE `app_auth` ADD COLUMN `namespace_id` varchar(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385' COMMENT 'namespaceId' AFTER `enabled`;
-ALTER TABLE `discovery` ADD COLUMN `namespace_id` varchar(50) NOT NULL COMMENT
'namespaceId' AFTER `plugin_name`;
+ALTER TABLE `discovery` ADD COLUMN `namespace_id` varchar(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385' COMMENT 'namespaceId' AFTER
`plugin_name`;
-ALTER TABLE `discovery_upstream` ADD COLUMN `namespace_id` varchar(50) NOT
NULL COMMENT 'namespaceId' AFTER `discovery_handler_id`;
+ALTER TABLE `discovery_upstream` ADD COLUMN `namespace_id` varchar(50) NOT
NULL default '649330b6-c2d7-4edc-be8e-8a54df9eb385' COMMENT 'namespaceId' AFTER
`discovery_handler_id`;
-ALTER TABLE `proxy_selector` ADD COLUMN `namespace_id` varchar(50) NOT NULL
COMMENT 'namespaceId' AFTER `props`;
+ALTER TABLE `proxy_selector` ADD COLUMN `namespace_id` varchar(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385' COMMENT 'namespaceId' AFTER
`props`;
-ALTER TABLE `alert_receiver` ADD COLUMN `namespace_id` varchar(50) NOT NULL
COMMENT 'namespaceId' AFTER `levels`;
+ALTER TABLE `alert_receiver` ADD COLUMN `namespace_id` varchar(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385' COMMENT 'namespaceId' AFTER
`levels`;
UPDATE selector
SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385'
diff --git a/db/upgrade/2.6.1-upgrade-2.7.0-og.sql
b/db/upgrade/2.6.1-upgrade-2.7.0-og.sql
index bfe46e9df6..3ab69e0c4d 100644
--- a/db/upgrade/2.6.1-upgrade-2.7.0-og.sql
+++ b/db/upgrade/2.6.1-upgrade-2.7.0-og.sql
@@ -168,28 +168,28 @@ INSERT INTO "public"."permission" VALUES
('1792779493541343267', '13463585604272
ALTER TABLE "public"."dashboard_user" ADD COLUMN client_id VARCHAR(32) NULL;
COMMENT ON COLUMN "public"."dashboard_user".client_id IS 'client id';
-ALTER TABLE "public"."selector" ADD COLUMN namespace_id VARCHAR(50) NOT NULL;
+ALTER TABLE "public"."selector" ADD COLUMN namespace_id VARCHAR(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."selector"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."rule" ADD COLUMN namespace_id VARCHAR(50) NOt NULL;
+ALTER TABLE "public"."rule" ADD COLUMN namespace_id VARCHAR(50) NOt NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."rule"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."meta_data" ADD COLUMN namespace_id VARCHAR(50) NOT NULL;
+ALTER TABLE "public"."meta_data" ADD COLUMN namespace_id VARCHAR(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."meta_data"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."app_auth" ADD COLUMN namespace_id VARCHAR(50) NOt NULL;
+ALTER TABLE "public"."app_auth" ADD COLUMN namespace_id VARCHAR(50) NOt NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."app_auth"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."discovery" ADD COLUMN namespace_id VARCHAR(50) NOT NULL;
+ALTER TABLE "public"."discovery" ADD COLUMN namespace_id VARCHAR(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."discovery"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."discovery_upstream" ADD COLUMN namespace_id VARCHAR(50)
NOT NULL;
+ALTER TABLE "public"."discovery_upstream" ADD COLUMN namespace_id VARCHAR(50)
NOT NULL default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."discovery_upstream"."namespace_id" IS
'namespaceId';
-ALTER TABLE "public"."proxy_selector" ADD COLUMN namespace_id VARCHAR(50) NOT
NULL;
+ALTER TABLE "public"."proxy_selector" ADD COLUMN namespace_id VARCHAR(50) NOT
NULL default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."proxy_selector"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."alert_receiver" ADD COLUMN namespace_id VARCHAR(50) NOT
NULL;
+ALTER TABLE "public"."alert_receiver" ADD COLUMN namespace_id VARCHAR(50) NOT
NULL default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."alert_receiver"."namespace_id" IS 'namespaceId';
UPDATE "public"."selector" SET namespace_id =
'649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL OR
LENGTH(namespace_id) = 0;
diff --git a/db/upgrade/2.6.1-upgrade-2.7.0-oracle.sql
b/db/upgrade/2.6.1-upgrade-2.7.0-oracle.sql
index a7dad8eaaa..5f15f9e80a 100755
--- a/db/upgrade/2.6.1-upgrade-2.7.0-oracle.sql
+++ b/db/upgrade/2.6.1-upgrade-2.7.0-oracle.sql
@@ -219,28 +219,28 @@ INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (permission(id)) */
INTO permission (id, o
ALTER TABLE dashboard_user ADD client_id VARCHAR(32) NULL;
COMMENT ON COLUMN dashboard_user.client_id IS 'client id';
-ALTER TABLE selector ADD namespace_id VARCHAR2(50) NOT NULL;
+ALTER TABLE selector ADD namespace_id VARCHAR2(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN selector.namespace_id IS 'namespaceId';
-ALTER TABLE rule ADD namespace_id VARCHAR2(50) NOT NULL;
+ALTER TABLE rule ADD namespace_id VARCHAR2(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN rule.namespace_id IS 'namespaceId';
-ALTER TABLE meta_data ADD namespace_id VARCHAR2(50) NOT NULL;
+ALTER TABLE meta_data ADD namespace_id VARCHAR2(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN meta_data.namespace_id IS 'namespaceId';
-ALTER TABLE app_auth ADD namespace_id VARCHAR2(50) NOT NULL;
+ALTER TABLE app_auth ADD namespace_id VARCHAR2(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN app_auth.namespace_id IS 'namespaceId';
-ALTER TABLE discovery ADD namespace_id VARCHAR2(50) NOT NULL;
+ALTER TABLE discovery ADD namespace_id VARCHAR2(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN discovery.namespace_id IS 'namespaceId';
-ALTER TABLE discovery_upstream ADD namespace_id VARCHAR2(50) NOT NULL;
+ALTER TABLE discovery_upstream ADD namespace_id VARCHAR2(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN discovery_upstream.namespace_id IS 'namespaceId';
-ALTER TABLE proxy_selector ADD namespace_id VARCHAR2(50) NOT NULL;
+ALTER TABLE proxy_selector ADD namespace_id VARCHAR2(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN proxy_selector.namespace_id IS 'namespaceId';
-ALTER TABLE alert_receiver ADD namespace_id VARCHAR2(50) NOT NULL;
+ALTER TABLE alert_receiver ADD namespace_id VARCHAR2(50) NOT NULL default
'649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN alert_receiver.namespace_id IS 'namespaceId';
UPDATE selector SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385'
WHERE namespace_id IS NULL OR LENGTH(namespace_id) = 0;
diff --git a/db/upgrade/2.6.1-upgrade-2.7.0-pg.sql
b/db/upgrade/2.6.1-upgrade-2.7.0-pg.sql
index 5f841b95ea..fb28bf092e 100755
--- a/db/upgrade/2.6.1-upgrade-2.7.0-pg.sql
+++ b/db/upgrade/2.6.1-upgrade-2.7.0-pg.sql
@@ -171,28 +171,28 @@ INSERT INTO "public"."resource" VALUES
('1844026099075534848', '1844015648095666
ALTER TABLE "public"."dashboard_user" ADD COLUMN client_id VARCHAR(32) NULL;
COMMENT ON COLUMN "public"."dashboard_user".client_id IS 'client id';
-ALTER TABLE "public"."selector" ADD COLUMN namespace_id VARCHAR(50) NOT NULL;
+ALTER TABLE "public"."selector" ADD COLUMN namespace_id VARCHAR(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."selector"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."rule" ADD COLUMN namespace_id VARCHAR(50) NOT NULL;
+ALTER TABLE "public"."rule" ADD COLUMN namespace_id VARCHAR(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."rule"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."meta_data" ADD COLUMN namespace_id VARCHAR(50) NOT NULL;
+ALTER TABLE "public"."meta_data" ADD COLUMN namespace_id VARCHAR(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."meta_data"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."app_auth" ADD COLUMN namespace_id VARCHAR(50) NOT NULL;
+ALTER TABLE "public"."app_auth" ADD COLUMN namespace_id VARCHAR(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."app_auth"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."discovery" ADD COLUMN namespace_id VARCHAR(50) NOT NULL;
+ALTER TABLE "public"."discovery" ADD COLUMN namespace_id VARCHAR(50) NOT NULL
default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."discovery"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."discovery_upstream" ADD COLUMN namespace_id VARCHAR(50)
NOT NULL;
+ALTER TABLE "public"."discovery_upstream" ADD COLUMN namespace_id VARCHAR(50)
NOT NULL default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."discovery_upstream"."namespace_id" IS
'namespaceId';
-ALTER TABLE "public"."proxy_selector" ADD COLUMN namespace_id VARCHAR(50) NOT
NULL;
+ALTER TABLE "public"."proxy_selector" ADD COLUMN namespace_id VARCHAR(50) NOT
NULL default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."proxy_selector"."namespace_id" IS 'namespaceId';
-ALTER TABLE "public"."alert_receiver" ADD COLUMN namespace_id VARCHAR(50) NOT
NULL;
+ALTER TABLE "public"."alert_receiver" ADD COLUMN namespace_id VARCHAR(50) NOT
NULL default '649330b6-c2d7-4edc-be8e-8a54df9eb385';
COMMENT ON COLUMN "public"."alert_receiver"."namespace_id" IS 'namespaceId';
UPDATE "public"."selector" SET namespace_id =
'649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL OR
LENGTH(namespace_id) = 0;
