Skip to content

Commit 4720162

Browse files
yuluo-yxyuluo-yx
committed
feat: adapt other db for discovery sql fields
Signed-off-by: yuluo-yx <[email protected]>
1 parent 6632d5e commit 4720162

23 files changed

+126
-112
lines changed

‎db/init/mysql/schema.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2335,11 +2335,11 @@ DROP TABLE IF EXISTS `discovery`;
23352335
CREATE TABLE `discovery`
23362336
(
23372337
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
2338-
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery name',
2338+
`discovery_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery name',
23392339
`level` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '0 selector,1 plugin 2 global',
23402340
`plugin_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'the plugin name',
23412341
`namespace_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'namespace id',
2342-
`type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'local,zookeeper,etcd,consul,nacos',
2342+
`discovery_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'local,zookeeper,etcd,consul,nacos',
23432343
`server_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'register server url (,)',
23442344
`props` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'the discovery pops (json) ',
23452345
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT 'create time',

‎db/init/ob/schema.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2250,11 +2250,11 @@ DROP TABLE IF EXISTS `discovery`;
22502250
CREATE TABLE `discovery`
22512251
(
22522252
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
2253-
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery name',
2253+
`discovery_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery name',
22542254
`level` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '0 selector,1 plugin 2 global',
22552255
`plugin_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'the plugin name',
22562256
`namespace_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'namespace id',
2257-
`type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'local,zookeeper,etcd,consul,nacos',
2257+
`discovery_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'local,zookeeper,etcd,consul,nacos',
22582258
`server_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'register server url (,)',
22592259
`props` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'the discovery pops (json) ',
22602260
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT 'create time',

‎db/init/og/create-table.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2385,10 +2385,10 @@ COMMENT ON COLUMN "public"."tag_relation"."date_updated" IS 'update time';
23852385
DROP TABLE IF EXISTS "public"."discovery";
23862386
CREATE TABLE "public"."discovery" (
23872387
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
2388-
"name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
2388+
"discovery_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
23892389
"level" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
23902390
"plugin_name" varchar(255) COLLATE "pg_catalog"."default",
2391-
"type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
2391+
"discovery_type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
23922392
"server_list" varchar(255) COLLATE "pg_catalog"."default",
23932393
"props" text COLLATE "pg_catalog"."default",
23942394
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,

‎db/init/oracle/schema.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2512,11 +2512,11 @@ comment on column TAG_RELATION.date_updated
25122512
create table discovery
25132513
(
25142514
id VARCHAR2(128) not null,
2515-
name VARCHAR2(255) not null,
2515+
discovery_name VARCHAR2(255) not null,
25162516
level VARCHAR2(64) not null,
25172517
plugin_name VARCHAR2(255),
25182518
namespace_id VARCHAR2(50) not null,
2519-
type VARCHAR2(64) not null,
2519+
discovery_type VARCHAR2(64) not null,
25202520
server_list VARCHAR2(255),
25212521
props CLOB,
25222522
date_created timestamp(3) default SYSDATE not null,

‎db/init/pg/create-table.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2512,11 +2512,11 @@ COMMENT ON COLUMN "public"."tag_relation"."date_updated" IS 'update time';
25122512
DROP TABLE IF EXISTS "public"."discovery";
25132513
CREATE TABLE "public"."discovery" (
25142514
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
2515-
"name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
2515+
"discovery_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
25162516
"level" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
25172517
"plugin_name" varchar(255) COLLATE "pg_catalog"."default",
25182518
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
2519-
"type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
2519+
"discovery_type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
25202520
"server_list" varchar(255) COLLATE "pg_catalog"."default",
25212521
"props" text COLLATE "pg_catalog"."default",
25222522
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
@@ -3185,4 +3185,4 @@ INSERT INTO "public"."permission" VALUES ('1953049887387303901', '13463585604272
31853185
INSERT INTO "public"."permission" VALUES ('1953049887387303902', '1346358560427216896', '1953048313980116901', '2025-08-06 17:00:00.000', '2025-08-06 17:00:00.000');
31863186
INSERT INTO "public"."permission" VALUES ('1953049887387303903', '1346358560427216896', '1953048313980116902', '2025-08-06 17:00:00.000', '2025-08-06 17:00:00.000');
31873187
INSERT INTO "public"."permission" VALUES ('1953049887387303904', '1346358560427216896', '1953048313980116903', '2025-08-06 17:00:00.000', '2025-08-06 17:00:00.000');
3188-
INSERT INTO "public"."permission" VALUES ('1953049887387303905', '1346358560427216896', '1953048313980116904', '2025-08-06 17:00:00.000', '2025-08-06 17:00:00.000');
3188+
INSERT INTO "public"."permission" VALUES ('1953049887387303905', '1346358560427216896', '1953048313980116904', '2025-08-06 17:00:00.000', '2025-08-06 17:00:00.000');

‎db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,3 +273,5 @@ ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64) CHARACTE
273273
ALTER TABLE `tag` CHANGE COLUMN `name` `tag_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag name';
274274
ALTER TABLE `rule` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL COMMENT 'sort';
275275
ALTER TABLE `rule` CHANGE COLUMN `name` `rule_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name';
276+
ALTER TABLE `discovery` CHANGE COLUMN `name` `discovery_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'discovery name';
277+
ALTER TABLE `discovery` CHANGE COLUMN `type` `discovery_type` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'discovery name';

‎db/upgrade/2.7.0-upgrade-2.7.1-ob.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,3 +266,5 @@ ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64) CHARACTE
266266
ALTER TABLE `tag` CHANGE COLUMN `name` `tag_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag name';
267267
ALTER TABLE `rule` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL COMMENT 'sort';
268268
ALTER TABLE `rule` CHANGE COLUMN `name` `rule_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name';
269+
ALTER TABLE `discovery` CHANGE COLUMN `type` `discovery_type` int(0) NOT NULL COMMENT 'discovery type';
270+
ALTER TABLE `discovery` CHANGE COLUMN `name` `discovery_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'discovery name';

‎db/upgrade/2.7.0-upgrade-2.7.1-og.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,3 +290,5 @@ ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
290290
ALTER TABLE "public"."tag" RENAME COLUMN "name" TO "tag_name";
291291
ALTER TABLE "public"."rule" RENAME COLUMN "sort" TO "sort_code";
292292
ALTER TABLE "public"."rule" RENAME COLUMN "name" TO "rule_name";
293+
ALTER TABLE "public"."discovery" RENAME COLUMN "type" TO "discovery_type";
294+
ALTER TABLE "public"."discovery" RENAME COLUMN "name" TO "discovery_name";

‎db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,3 +580,5 @@ ALTER TABLE selector RENAME COLUMN "name" TO "selector_name";
580580
ALTER TABLE tag RENAME COLUMN "name" TO "tag_name";
581581
ALTER TABLE rule RENAME COLUMN "sort" TO "sort_code";
582582
ALTER TABLE rule RENAME COLUMN "name" TO "rule_name";
583+
ALTER TABLE discovery RENAME COLUMN "type" TO "discovery_type";
584+
ALTER TABLE discovery RENAME COLUMN "name" TO "discovery_name";

‎db/upgrade/2.7.0-upgrade-2.7.1-pg.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,3 +288,5 @@ ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
288288
ALTER TABLE "public"."tag" RENAME COLUMN "name" TO "tag_name";
289289
ALTER TABLE "public"."rule" RENAME COLUMN "sort" TO "sort_code";
290290
ALTER TABLE "public"."rule" RENAME COLUMN "name" TO "rule_name";
291+
ALTER TABLE "public"."discovery" RENAME COLUMN "type" TO "discovery_type";
292+
ALTER TABLE "public"."discovery" RENAME COLUMN "name" TO "discovery_name";

0 commit comments

Comments
 (0)