adjust the sql a little bit so that ddl is before dml

apolloconfig · Dec 17, 2023 · 589e462 · 589e462
1 parent 1e08c60
commit 589e462
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 66 deletions.
diff --git a/scripts/sql/apolloconfigdb.sql b/scripts/sql/apolloconfigdb.sql
@@ -429,24 +429,8 @@ CREATE TABLE `ServiceRegistry` (
  INDEX `IX_DataChange_LastTime` (`DataChange_LastTime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='注册中心';
 
-
-# Config
+# Dump of table AuditLog
 # ------------------------------------------------------------
-INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`, `Comment`)
-VALUES
- ('eureka.service.url', 'default', 'http://localhost:8080/eureka/', 'Eureka服务Url，多个service以英文逗号分隔'),
- ('namespace.lock.switch', 'default', 'false', '一次发布只能有一个人修改开关'),
- ('item.key.length.limit', 'default', '128', 'item key 最大长度限制'),
- ('item.value.length.limit', 'default', '20000', 'item value最大长度限制'),
- ('config-service.cache.enabled', 'default', 'false', 'ConfigService是否开启缓存，开启后能提高性能，但是会增大内存消耗！');
-
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-
 
 DROP TABLE IF EXISTS `AuditLog`;
 
@@ -473,6 +457,8 @@ CREATE TABLE `AuditLog` (
  KEY `IX_Operator` (`Operator`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='审计日志表';
 
+# Dump of table AuditLogDataInfluence
+# ------------------------------------------------------------
 
 DROP TABLE IF EXISTS `AuditLogDataInfluence`;
 
@@ -494,4 +480,21 @@ CREATE TABLE `AuditLogDataInfluence` (
  KEY `IX_SpanId` (`SpanId`),
  KEY `IX_DataChange_CreatedTime` (`DataChange_CreatedTime`),
  KEY `IX_EntityId` (`InfluenceEntityId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='审计日志数据变动表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='审计日志数据变动表';
+
+# Config
+# ------------------------------------------------------------
+INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`, `Comment`)
+VALUES
+ ('eureka.service.url', 'default', 'http://localhost:8080/eureka/', 'Eureka服务Url，多个service以英文逗号分隔'),
+ ('namespace.lock.switch', 'default', 'false', '一次发布只能有一个人修改开关'),
+ ('item.key.length.limit', 'default', '128', 'item key 最大长度限制'),
+ ('item.value.length.limit', 'default', '20000', 'item value最大长度限制'),
+ ('config-service.cache.enabled', 'default', 'false', 'ConfigService是否开启缓存，开启后能提高性能，但是会增大内存消耗！');
+
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/scripts/sql/apolloportaldb.sql b/scripts/sql/apolloportaldb.sql
@@ -330,58 +330,41 @@ CREATE TABLE `Authorities` (
  PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-
-# Config
+-- spring session (https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql)
+# Dump of table SPRING_SESSION
 # ------------------------------------------------------------
-INSERT INTO `ServerConfig` (`Key`, `Value`, `Comment`)
-VALUES
- ('apollo.portal.envs', 'dev', '可支持的环境列表'),
- ('organizations', '[{\"orgId\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgId\":\"TEST2\",\"orgName\":\"样例部门2\"}]', '部门列表'),
- ('superAdmin', 'apollo', 'Portal超级管理员'),
- ('api.readTimeout', '10000', 'http接口read timeout'),
- ('consumer.token.salt', 'someSalt', 'consumer token salt'),
- ('admin.createPrivateNamespace.switch', 'true', '是否允许项目管理员创建私有namespace'),
- ('configView.memberOnly.envs', 'pro', '只对项目成员显示配置信息的环境列表，多个env以英文逗号分隔'),
- ('apollo.portal.meta.servers', '{}', '各环境Meta Service列表');
-
 
-INSERT INTO `Users` (`Username`, `Password`, `UserDisplayName`, `Email`, `Enabled`)
-VALUES
- ('apollo', '$2a$10$7r20uS.BQ9uBpf3Baj3uQOZvMVvB1RN3PYoKE94gtz2.WAOuiiwXS', 'apollo', 'apollo@acme.com', 1);
+DROP TABLE IF EXISTS `SPRING_SESSION`;
+
+CREATE TABLE `SPRING_SESSION` (
+ `PRIMARY_ID` char(36) NOT NULL,
+ `SESSION_ID` char(36) NOT NULL,
+ `CREATION_TIME` bigint NOT NULL,
+ `LAST_ACCESS_TIME` bigint NOT NULL,
+ `MAX_INACTIVE_INTERVAL` int NOT NULL,
+ `EXPIRY_TIME` bigint NOT NULL,
+ `PRINCIPAL_NAME` varchar(100) DEFAULT NULL,
+ PRIMARY KEY (`PRIMARY_ID`),
+ UNIQUE KEY `SPRING_SESSION_IX1` (`SESSION_ID`),
+ KEY `SPRING_SESSION_IX2` (`EXPIRY_TIME`),
+ KEY `SPRING_SESSION_IX3` (`PRINCIPAL_NAME`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+
+# Dump of table SPRING_SESSION_ATTRIBUTES
+# ------------------------------------------------------------
 
-INSERT INTO `Authorities` (`Username`, `Authority`) VALUES ('apollo', 'ROLE_user');
+DROP TABLE IF EXISTS `SPRING_SESSION_ATTRIBUTES`;
 
--- spring session (https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql)
-CREATE TABLE SPRING_SESSION (
- PRIMARY_ID CHAR(36) NOT NULL,
- SESSION_ID CHAR(36) NOT NULL,
- CREATION_TIME BIGINT NOT NULL,
- LAST_ACCESS_TIME BIGINT NOT NULL,
- MAX_INACTIVE_INTERVAL INT NOT NULL,
- EXPIRY_TIME BIGINT NOT NULL,
- PRINCIPAL_NAME VARCHAR(100),
- CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID)
-) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
-
-CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID);
-CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME);
-CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME);
-
-CREATE TABLE SPRING_SESSION_ATTRIBUTES (
- SESSION_PRIMARY_ID CHAR(36) NOT NULL,
- ATTRIBUTE_NAME VARCHAR(200) NOT NULL,
- ATTRIBUTE_BYTES BLOB NOT NULL,
- CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_PRIMARY_ID, ATTRIBUTE_NAME),
- CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_PRIMARY_ID) REFERENCES SPRING_SESSION(PRIMARY_ID) ON DELETE CASCADE
-) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
-
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+CREATE TABLE `SPRING_SESSION_ATTRIBUTES` (
+ `SESSION_PRIMARY_ID` char(36) NOT NULL,
+ `ATTRIBUTE_NAME` varchar(200) NOT NULL,
+ `ATTRIBUTE_BYTES` blob NOT NULL,
+ PRIMARY KEY (`SESSION_PRIMARY_ID`,`ATTRIBUTE_NAME`),
+ CONSTRAINT `SPRING_SESSION_ATTRIBUTES_FK` FOREIGN KEY (`SESSION_PRIMARY_ID`) REFERENCES `SPRING_SESSION` (`PRIMARY_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
+# Dump of table AuditLog
+# ------------------------------------------------------------
 
 DROP TABLE IF EXISTS `AuditLog`;
 
@@ -408,6 +391,8 @@ CREATE TABLE `AuditLog` (
  KEY `IX_Operator` (`Operator`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='审计日志表';
 
+# Dump of table AuditLogDataInfluence
+# ------------------------------------------------------------
 
 DROP TABLE IF EXISTS `AuditLogDataInfluence`;
 
@@ -429,4 +414,31 @@ CREATE TABLE `AuditLogDataInfluence` (
  KEY `IX_SpanId` (`SpanId`),
  KEY `IX_DataChange_CreatedTime` (`DataChange_CreatedTime`),
  KEY `IX_EntityId` (`InfluenceEntityId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='审计日志数据变动表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='审计日志数据变动表';
+
+# Config
+# ------------------------------------------------------------
+INSERT INTO `ServerConfig` (`Key`, `Value`, `Comment`)
+VALUES
+ ('apollo.portal.envs', 'dev', '可支持的环境列表'),
+ ('organizations', '[{\"orgId\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgId\":\"TEST2\",\"orgName\":\"样例部门2\"}]', '部门列表'),
+ ('superAdmin', 'apollo', 'Portal超级管理员'),
+ ('api.readTimeout', '10000', 'http接口read timeout'),
+ ('consumer.token.salt', 'someSalt', 'consumer token salt'),
+ ('admin.createPrivateNamespace.switch', 'true', '是否允许项目管理员创建私有namespace'),
+ ('configView.memberOnly.envs', 'pro', '只对项目成员显示配置信息的环境列表，多个env以英文逗号分隔'),
+ ('apollo.portal.meta.servers', '{}', '各环境Meta Service列表');
+
+
+INSERT INTO `Users` (`Username`, `Password`, `UserDisplayName`, `Email`, `Enabled`)
+VALUES
+ ('apollo', '$2a$10$7r20uS.BQ9uBpf3Baj3uQOZvMVvB1RN3PYoKE94gtz2.WAOuiiwXS', 'apollo', 'apollo@acme.com', 1);
+
+INSERT INTO `Authorities` (`Username`, `Authority`) VALUES ('apollo', 'ROLE_user');
+
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;