Skip to content

Commit 234492e

Browse files
xuxuzhesixuxuzhesi
authored
Merge pull request #860 from WeBankPartners/sql_adapter_h2base
Sql adapter h2base
2 parents 6226127 + aa4534f commit 234492e

2 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎cmdb-core/src/main/resources/database/ch/01.cmdb.schema_ch.sql‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -468,11 +468,11 @@ CREATE TABLE IF NOT EXISTS `app_system` (
468468

469469
CREATE TABLE IF NOT EXISTS `app_system$data_center` (
470470
`id` int(11) NOT NULL AUTO_INCREMENT,
471-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
472-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
471+
`from_guid` varchar(15) NOT NULL,
472+
`to_guid` varchar(15) NOT NULL,
473473
`seq_no` int(5) DEFAULT '0',
474474
PRIMARY KEY (`id`)
475-
) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
475+
) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
476476

477477
CREATE TABLE IF NOT EXISTS `app_system_design` (
478478
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -546,11 +546,11 @@ CREATE TABLE IF NOT EXISTS `business_zone` (
546546

547547
CREATE TABLE IF NOT EXISTS `business_zone$network_segment` (
548548
`id` int(11) NOT NULL AUTO_INCREMENT,
549-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
550-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
549+
`from_guid` varchar(15) NOT NULL,
550+
`to_guid` varchar(15) NOT NULL,
551551
`seq_no` int(5) DEFAULT '0',
552552
PRIMARY KEY (`id`)
553-
) ENGINE=InnoDB AUTO_INCREMENT=282 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
553+
) ENGINE=InnoDB AUTO_INCREMENT=282 DEFAULT CHARSET=utf8;
554554

555555
CREATE TABLE IF NOT EXISTS `business_zone_design` (
556556
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -572,19 +572,19 @@ CREATE TABLE IF NOT EXISTS `business_zone_design` (
572572

573573
CREATE TABLE IF NOT EXISTS `business_zone_design$application_domain` (
574574
`id` int(11) NOT NULL AUTO_INCREMENT,
575-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
576-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
575+
`from_guid` varchar(15) NOT NULL,
576+
`to_guid` varchar(15) NOT NULL,
577577
`seq_no` int(5) DEFAULT '0',
578578
PRIMARY KEY (`id`)
579-
) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
579+
) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8;
580580

581581
CREATE TABLE IF NOT EXISTS `business_zone_design$network_segment_design` (
582582
`id` int(11) NOT NULL AUTO_INCREMENT,
583-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
584-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
583+
`from_guid` varchar(15) NOT NULL,
584+
`to_guid` varchar(15) NOT NULL,
585585
`seq_no` int(5) DEFAULT '0',
586586
PRIMARY KEY (`id`)
587-
) ENGINE=InnoDB AUTO_INCREMENT=136 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
587+
) ENGINE=InnoDB AUTO_INCREMENT=136 DEFAULT CHARSET=utf8;
588588

589589
CREATE TABLE IF NOT EXISTS `cache_instance` (
590590
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -747,11 +747,11 @@ CREATE TABLE IF NOT EXISTS `data_center` (
747747

748748
CREATE TABLE IF NOT EXISTS `data_center$deploy_environment` (
749749
`id` int(11) NOT NULL AUTO_INCREMENT,
750-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
751-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
750+
`from_guid` varchar(15) NOT NULL,
751+
`to_guid` varchar(15) NOT NULL,
752752
`seq_no` int(5) DEFAULT '0',
753753
PRIMARY KEY (`id`)
754-
) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
754+
) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8;
755755

756756
CREATE TABLE IF NOT EXISTS `data_center_design` (
757757
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -867,11 +867,11 @@ CREATE TABLE IF NOT EXISTS `deploy_package` (
867867

868868
CREATE TABLE IF NOT EXISTS `deploy_package$diff_conf_variable` (
869869
`id` int(11) NOT NULL AUTO_INCREMENT,
870-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
871-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
870+
`from_guid` varchar(15) NOT NULL,
871+
`to_guid` varchar(15) NOT NULL,
872872
`seq_no` int(5) DEFAULT '0',
873873
PRIMARY KEY (`id`)
874-
) ENGINE=InnoDB AUTO_INCREMENT=114 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
874+
) ENGINE=InnoDB AUTO_INCREMENT=114 DEFAULT CHARSET=utf8;
875875

876876
CREATE TABLE IF NOT EXISTS `diff_configuration` (
877877
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -1114,11 +1114,11 @@ CREATE TABLE IF NOT EXISTS `network_link` (
11141114

11151115
CREATE TABLE IF NOT EXISTS `network_link$internet_ip` (
11161116
`id` int(11) NOT NULL AUTO_INCREMENT,
1117-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1118-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1117+
`from_guid` varchar(15) NOT NULL,
1118+
`to_guid` varchar(15) NOT NULL,
11191119
`seq_no` int(5) DEFAULT '0',
11201120
PRIMARY KEY (`id`)
1121-
) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1121+
) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
11221122

11231123
CREATE TABLE IF NOT EXISTS `network_link_design` (
11241124
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -1415,19 +1415,19 @@ CREATE TABLE IF NOT EXISTS `resource_set` (
14151415

14161416
CREATE TABLE IF NOT EXISTS `resource_set$deploy_environment` (
14171417
`id` int(11) NOT NULL AUTO_INCREMENT,
1418-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1419-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1418+
`from_guid` varchar(15) NOT NULL,
1419+
`to_guid` varchar(15) NOT NULL,
14201420
`seq_no` int(5) DEFAULT '0',
14211421
PRIMARY KEY (`id`)
1422-
) ENGINE=InnoDB AUTO_INCREMENT=146 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1422+
) ENGINE=InnoDB AUTO_INCREMENT=146 DEFAULT CHARSET=utf8;
14231423

14241424
CREATE TABLE IF NOT EXISTS `resource_set$network_segment` (
14251425
`id` int(11) NOT NULL AUTO_INCREMENT,
1426-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1427-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1426+
`from_guid` varchar(15) NOT NULL,
1427+
`to_guid` varchar(15) NOT NULL,
14281428
`seq_no` int(5) DEFAULT '0',
14291429
PRIMARY KEY (`id`)
1430-
) ENGINE=InnoDB AUTO_INCREMENT=213 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1430+
) ENGINE=InnoDB AUTO_INCREMENT=213 DEFAULT CHARSET=utf8;
14311431

14321432
CREATE TABLE IF NOT EXISTS `resource_set_design` (
14331433
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -1573,11 +1573,11 @@ CREATE TABLE IF NOT EXISTS `service_invoke_seq_design` (
15731573

15741574
CREATE TABLE IF NOT EXISTS `service_invoke_seq_design$service_invoke_design_sequence` (
15751575
`id` int(11) NOT NULL AUTO_INCREMENT,
1576-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1577-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1576+
`from_guid` varchar(15) NOT NULL,
1577+
`to_guid` varchar(15) NOT NULL,
15781578
`seq_no` int(5) DEFAULT '0',
15791579
PRIMARY KEY (`id`)
1580-
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1580+
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
15811581

15821582
CREATE TABLE IF NOT EXISTS `storage_type` (
15831583
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -1621,11 +1621,11 @@ CREATE TABLE IF NOT EXISTS `subsys` (
16211621

16221622
CREATE TABLE IF NOT EXISTS `subsys$business_zone` (
16231623
`id` int(11) NOT NULL AUTO_INCREMENT,
1624-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1625-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1624+
`from_guid` varchar(15) NOT NULL,
1625+
`to_guid` varchar(15) NOT NULL,
16261626
`seq_no` int(5) DEFAULT '0',
16271627
PRIMARY KEY (`id`)
1628-
) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1628+
) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8;
16291629

16301630
CREATE TABLE IF NOT EXISTS `subsys_design` (
16311631
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -1649,11 +1649,11 @@ CREATE TABLE IF NOT EXISTS `subsys_design` (
16491649

16501650
CREATE TABLE IF NOT EXISTS `subsys_design$business_zone_design` (
16511651
`id` int(11) NOT NULL AUTO_INCREMENT,
1652-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1653-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1652+
`from_guid` varchar(15) NOT NULL,
1653+
`to_guid` varchar(15) NOT NULL,
16541654
`seq_no` int(5) DEFAULT '0',
16551655
PRIMARY KEY (`id`)
1656-
) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1656+
) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8;
16571657

16581658
CREATE TABLE IF NOT EXISTS `unit` (
16591659
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',
@@ -1683,11 +1683,11 @@ CREATE TABLE IF NOT EXISTS `unit` (
16831683

16841684
CREATE TABLE IF NOT EXISTS `unit$deploy_package` (
16851685
`id` int(11) NOT NULL AUTO_INCREMENT,
1686-
`from_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1687-
`to_guid` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
1688-
`seq_no` int(5) DEFAULT '0',
1686+
`from_guid` varchar(15) NOT NULL,
1687+
`to_guid` varchar(15) NOT NULL,
1688+
`seq_no` int(5) DEFAULT 0,
16891689
PRIMARY KEY (`id`)
1690-
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1690+
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
16911691

16921692
CREATE TABLE IF NOT EXISTS `unit_design` (
16931693
`guid` varchar(15) NOT NULL COMMENT '全局唯一ID',

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<properties>
14-
<cmdb.version>1.4.2-SNAPSHOT</cmdb.version>
14+
<cmdb.version>1.4.3-SNAPSHOT</cmdb.version>
1515
<java.version>1.8</java.version>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
</properties>

0 commit comments

Comments
 (0)