From 78099b4a5161f6e0caa3ea94e444536baeab49fb Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Tue, 28 Feb 2023 09:26:52 +0800 Subject: [PATCH] Bump h2 version to 2.x, consistent with springboot --- .../src/test/resources/application.properties | 2 +- .../resources/controller/test-release.sql | 6 +-- .../controller/test-server-config.sql | 2 +- .../src/test/resources/data.sql | 9 ++-- .../filter/test-access-control-disabled.sql | 2 +- .../test-access-control-enabled-no-token.sql | 2 +- .../filter/test-access-control-enabled.sql | 2 +- .../src/test/resources/import.sql | 23 +++++++++- .../framework/apollo/biz/entity/Item.java | 6 +-- .../apollo/biz/entity/ServerConfig.java | 6 +-- .../src/test/resources/application.properties | 2 +- apollo-biz/src/test/resources/import.sql | 41 ++++++++++++++++- .../src/test/resources/sql/item-test.sql | 2 +- .../src/test/resources/sql/namespace-test.sql | 2 +- .../resources/sql/release-creation-test.sql | 44 +++++++++---------- .../src/test/resources/application.properties | 2 +- .../src/test/resources/data.sql | 9 ++-- .../src/test/resources/import.sql | 31 ++++++++++++- .../apollo/portal/entity/po/ServerConfig.java | 4 +- .../src/test/resources/application.properties | 2 +- apollo-portal/src/test/resources/import.sql | 21 ++++++++- pom.xml | 6 --- 22 files changed, 163 insertions(+), 63 deletions(-) diff --git a/apollo-adminservice/src/test/resources/application.properties b/apollo-adminservice/src/test/resources/application.properties index b7bb47b8188..84caf0dd7c3 100644 --- a/apollo-adminservice/src/test/resources/application.properties +++ b/apollo-adminservice/src/test/resources/application.properties @@ -17,7 +17,7 @@ spring.cloud.consul.enabled=false spring.cloud.zookeeper.enabled=false spring.cloud.discovery.enabled=false -spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1 +spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1;BUILTIN_ALIAS_OVERRIDE=TRUE spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl spring.jpa.hibernate.globally_quoted_identifiers=false diff --git a/apollo-adminservice/src/test/resources/controller/test-release.sql b/apollo-adminservice/src/test/resources/controller/test-release.sql index fe5d65aeaa7..5d9c8f714d4 100644 --- a/apollo-adminservice/src/test/resources/controller/test-release.sql +++ b/apollo-adminservice/src/test/resources/controller/test-release.sql @@ -21,6 +21,6 @@ INSERT INTO AppNamespace (AppId, Name) VALUES ('someAppId', 'application'); INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (100, 'someAppId', 'default', 'application'); -INSERT INTO Item (NamespaceId, `Key`, `Type`, Value, Comment) VALUES (100, 'k1', '0', 'v1', 'comment1'); -INSERT INTO Item (NamespaceId, `Key`, `Type`, Value, Comment) VALUES (100, 'k2', '0', 'v2', 'comment1'); -INSERT INTO Item (NamespaceId, `Key`, `Type`, Value, Comment) VALUES (100, 'k3', '0', 'v3', 'comment1'); \ No newline at end of file +INSERT INTO Item (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k1', '0', 'v1', 'comment1'); +INSERT INTO Item (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k2', '0', 'v2', 'comment1'); +INSERT INTO Item (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k3', '0', 'v3', 'comment1'); diff --git a/apollo-adminservice/src/test/resources/controller/test-server-config.sql b/apollo-adminservice/src/test/resources/controller/test-server-config.sql index 9b22d35b36f..ca3134408fb 100644 --- a/apollo-adminservice/src/test/resources/controller/test-server-config.sql +++ b/apollo-adminservice/src/test/resources/controller/test-server-config.sql @@ -13,6 +13,6 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`) +INSERT INTO `ServerConfig` ("Key", "Cluster", "Value") VALUES ('name', 'default', 'kl'); diff --git a/apollo-adminservice/src/test/resources/data.sql b/apollo-adminservice/src/test/resources/data.sql index f6af86343cc..9d275bd023b 100644 --- a/apollo-adminservice/src/test/resources/data.sql +++ b/apollo-adminservice/src/test/resources/data.sql @@ -40,10 +40,9 @@ INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (2, 'fxherm INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (3, '100003172', 'default', 'application'); INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (4, '100003173', 'default', 'application'); -INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k1', 'v1', 'comment1'); -INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k2', 'v2', 'comment2'); -INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (2, 'k3', 'v3', 'comment3'); -INSERT INTO Item (NamespaceId, `Key`, Value, Comment, LineNum) VALUES (5, 'k1', 'v4', 'comment4',1); +INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (1, 'k1', 'v1', 'comment1'); +INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (1, 'k2', 'v2', 'comment2'); +INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (2, 'k3', 'v3', 'comment3'); +INSERT INTO Item (NamespaceId, "Key", "Value", Comment, LineNum) VALUES (5, 'k1', 'v4', 'comment4',1); INSERT INTO RELEASE (ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES ('TEST-RELEASE-KEY', 'REV1','First Release','100003171', 'default', 'application', '{"k1":"v1"}'); - diff --git a/apollo-adminservice/src/test/resources/filter/test-access-control-disabled.sql b/apollo-adminservice/src/test/resources/filter/test-access-control-disabled.sql index d6f08a5d8b6..3c882a7bd43 100644 --- a/apollo-adminservice/src/test/resources/filter/test-access-control-disabled.sql +++ b/apollo-adminservice/src/test/resources/filter/test-access-control-disabled.sql @@ -13,7 +13,7 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`) +INSERT INTO `ServerConfig` ("Key", "Cluster", "Value") VALUES ('admin-service.access.tokens', 'default', 'someToken,anotherToken'), ('admin-service.access.control.enabled', 'default', 'false'); diff --git a/apollo-adminservice/src/test/resources/filter/test-access-control-enabled-no-token.sql b/apollo-adminservice/src/test/resources/filter/test-access-control-enabled-no-token.sql index 9235e757b5a..37bebc2143c 100644 --- a/apollo-adminservice/src/test/resources/filter/test-access-control-enabled-no-token.sql +++ b/apollo-adminservice/src/test/resources/filter/test-access-control-enabled-no-token.sql @@ -13,6 +13,6 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`) +INSERT INTO `ServerConfig` ("Key", "Cluster", "Value") VALUES ('admin-service.access.control.enabled', 'default', 'true'); diff --git a/apollo-adminservice/src/test/resources/filter/test-access-control-enabled.sql b/apollo-adminservice/src/test/resources/filter/test-access-control-enabled.sql index d1d92f306fc..59578e85a13 100644 --- a/apollo-adminservice/src/test/resources/filter/test-access-control-enabled.sql +++ b/apollo-adminservice/src/test/resources/filter/test-access-control-enabled.sql @@ -13,7 +13,7 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`) +INSERT INTO `ServerConfig` ("Key", "Cluster", "Value") VALUES ('admin-service.access.tokens', 'default', 'someToken,anotherToken'), ('admin-service.access.control.enabled', 'default', 'true'); diff --git a/apollo-adminservice/src/test/resources/import.sql b/apollo-adminservice/src/test/resources/import.sql index afd2dd89066..a73f48e5088 100644 --- a/apollo-adminservice/src/test/resources/import.sql +++ b/apollo-adminservice/src/test/resources/import.sql @@ -13,4 +13,25 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common.jpa.H2Function.unixTimestamp"; \ No newline at end of file +ALTER TABLE APP ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE APP ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE APP ALTER COLUMN ORGNAME VARCHAR(255) NULL; +ALTER TABLE APP ALTER COLUMN ORGID VARCHAR(255) NULL; +ALTER TABLE AppNamespace ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE AppNamespace ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE AppNamespace ALTER COLUMN Format VARCHAR(255) NULL; +ALTER TABLE Cluster ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Cluster ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Cluster ALTER COLUMN ParentClusterId BIGINT DEFAULT 0; +ALTER TABLE Namespace ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Namespace ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Item ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Item ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE RELEASE ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE RELEASE ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE ServerConfig ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE ServerConfig ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE ServerConfig ALTER COLUMN COMMENT VARCHAR(255) NULL; +ALTER TABLE Audit ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Audit ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common.jpa.H2Function.unixTimestamp"; diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java index 6686f722a91..00e0fb6d022 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java @@ -35,13 +35,13 @@ public class Item extends BaseEntity { @Column(name = "NamespaceId", nullable = false) private long namespaceId; - @Column(name = "key", nullable = false) + @Column(name = "`Key`", nullable = false) private String key; - @Column(name = "type") + @Column(name = "`Type`") private int type; - @Column(name = "value") + @Column(name = "`Value`") @Lob private String value; diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServerConfig.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServerConfig.java index 2b4a8cfd044..403e7c82c5c 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServerConfig.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServerConfig.java @@ -33,13 +33,13 @@ @SQLDelete(sql = "Update ServerConfig set IsDeleted = 1, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?") @Where(clause = "isDeleted = 0") public class ServerConfig extends BaseEntity { - @Column(name = "Key", nullable = false) + @Column(name = "`Key`", nullable = false) private String key; - @Column(name = "Cluster", nullable = false) + @Column(name = "`Cluster`", nullable = false) private String cluster; - @Column(name = "Value", nullable = false) + @Column(name = "`Value`", nullable = false) private String value; @Column(name = "Comment", nullable = false) diff --git a/apollo-biz/src/test/resources/application.properties b/apollo-biz/src/test/resources/application.properties index a66f0db707e..bb44b83b084 100644 --- a/apollo-biz/src/test/resources/application.properties +++ b/apollo-biz/src/test/resources/application.properties @@ -17,7 +17,7 @@ spring.cloud.consul.enabled=false spring.cloud.zookeeper.enabled=false spring.cloud.discovery.enabled=false -spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1 +spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1;BUILTIN_ALIAS_OVERRIDE=TRUE spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl spring.jpa.hibernate.globally_quoted_identifiers=false diff --git a/apollo-biz/src/test/resources/import.sql b/apollo-biz/src/test/resources/import.sql index afd2dd89066..51c11b6e4c5 100644 --- a/apollo-biz/src/test/resources/import.sql +++ b/apollo-biz/src/test/resources/import.sql @@ -13,4 +13,43 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common.jpa.H2Function.unixTimestamp"; \ No newline at end of file +ALTER TABLE APP ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE APP ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE APP ALTER COLUMN ORGNAME VARCHAR(255) NULL; +ALTER TABLE APP ALTER COLUMN ORGID VARCHAR(255) NULL; +ALTER TABLE AppNamespace ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE AppNamespace ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE AppNamespace ALTER COLUMN Format VARCHAR(255) NULL; +ALTER TABLE AccessKey ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE AccessKey ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Instance ALTER COLUMN CLUSTERNAME VARCHAR(255) NULL; +ALTER TABLE Instance ALTER COLUMN DATACENTER VARCHAR(255) NULL; +ALTER TABLE Instance ALTER COLUMN IP VARCHAR(255) NULL; +ALTER TABLE InstanceConfig ALTER COLUMN RELEASEDELIVERYTIME VARCHAR(255) NULL; +ALTER TABLE InstanceConfig ALTER COLUMN RELEASEKEY VARCHAR(255) NULL; +ALTER TABLE ServerConfig ALTER COLUMN DATACHANGE_CREATEDBY VARCHAR(255) NULL; +ALTER TABLE ServerConfig ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE ServerConfig ALTER COLUMN COMMENT VARCHAR(255) NULL; +ALTER TABLE Audit ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Audit ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Cluster ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Cluster ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Cluster ALTER COLUMN ParentClusterId BIGINT DEFAULT 0; +ALTER TABLE Namespace ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Namespace ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Item ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Item ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE GrayReleaseRule ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE GrayReleaseRule ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Release ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Release ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Release ALTER COLUMN Comment VARCHAR(255) NULL; +ALTER TABLE Release ALTER COLUMN Name VARCHAR(255) NULL; +ALTER TABLE Release ALTER COLUMN ReleaseKey VARCHAR(255) NULL; +ALTER TABLE ReleaseHistory ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE ReleaseHistory ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Commit ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Commit ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE NamespaceLock ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE NamespaceLock ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common.jpa.H2Function.unixTimestamp"; diff --git a/apollo-biz/src/test/resources/sql/item-test.sql b/apollo-biz/src/test/resources/sql/item-test.sql index a371e09efa8..7d3f6626ab9 100644 --- a/apollo-biz/src/test/resources/sql/item-test.sql +++ b/apollo-biz/src/test/resources/sql/item-test.sql @@ -13,7 +13,7 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -INSERT INTO `item` (`Id`, `NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `LineNum`) +INSERT INTO Item (`Id`, `NamespaceId`, "Key", "Type", "Value", `Comment`, `LineNum`) VALUES (9901, 1, 'k1', 0, 'v1', '', 1), (9902, 2, 'k2', 2, 'v2', '', 2); diff --git a/apollo-biz/src/test/resources/sql/namespace-test.sql b/apollo-biz/src/test/resources/sql/namespace-test.sql index b22f4dadab3..57f72b350b0 100644 --- a/apollo-biz/src/test/resources/sql/namespace-test.sql +++ b/apollo-biz/src/test/resources/sql/namespace-test.sql @@ -26,7 +26,7 @@ INSERT INTO `namespace` (`AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, ` INSERT INTO `commit` (`ChangeSets`, `AppId`, `ClusterName`, `NamespaceName`)VALUES('{}', 'testApp', 'default', 'application'); INSERT INTO `commit` (`ChangeSets`, `AppId`, `ClusterName`, `NamespaceName`, `DataChange_LastTime`)VALUES('{}', 'commitTestApp', 'default', 'application', '2020-08-22 10:00:00'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Value`, `Comment`, `LineNum`)VALUES(1, 'k1', 'v1', '', 1); +INSERT INTO `item` (`NamespaceId`, "Key", "Value", `Comment`, `LineNum`)VALUES(1, 'k1', 'v1', '', 1); INSERT INTO `namespacelock` (`NamespaceId`)VALUES(1); diff --git a/apollo-biz/src/test/resources/sql/release-creation-test.sql b/apollo-biz/src/test/resources/sql/release-creation-test.sql index 6bcbb5e3008..cf0af951dea 100644 --- a/apollo-biz/src/test/resources/sql/release-creation-test.sql +++ b/apollo-biz/src/test/resources/sql/release-creation-test.sql @@ -18,9 +18,9 @@ INSERT INTO `app` ( `AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmai /* normal namespace*/ INSERT INTO `cluster` ( `Name`, `AppId`, `ParentClusterId`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`) VALUES ( 'only-master', 'test', 0, 0, 'default', 'default'); INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(100, 'test', 'only-master', 'application', 0, 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(100, 'k1', '0', 'v1', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(100, 'k2', '0', 'v2', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(100, 'k3', '0', 'v3', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(100, 'k1', '0', 'v1', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(100, 'k2', '0', 'v2', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(100, 'k3', '0', 'v3', '', 'apollo', 'apollo'); /* namespace has branch. master has items but branch has not item*/ @@ -30,9 +30,9 @@ INSERT INTO `cluster` (ID, `Name`, `AppId`, `ParentClusterId`, `IsDeleted`, `Dat INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(101, 'test', 'default1', 'application', 0, 'apollo', 'apollo'); INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(102, 'test', 'child-cluster1', 'application', 0, 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(101, 'k1', '0', 'v1', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(101, 'k2', '0', 'v2', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(101, 'k3', '0', 'v3', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(101, 'k1', '0', 'v1', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(101, 'k2', '0', 'v2', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(101, 'k3', '0', 'v3', '', 'apollo', 'apollo'); INSERT INTO `grayreleaserule` (`AppId`, `ClusterName`, `NamespaceName`, `BranchName`, `Rules`, `ReleaseId`, `BranchStatus`)VALUES ('test', 'default1', 'application', 'child-cluster1', '[]', 1155, 1); @@ -45,10 +45,10 @@ INSERT INTO `cluster` (ID, `Name`, `AppId`, `ParentClusterId`, `IsDeleted`, `Dat INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(103, 'test', 'default2', 'application', 0, 'apollo', 'apollo'); INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(104, 'test', 'child-cluster2', 'application', 0, 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(103, 'k1', '0', 'v1', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(103, 'k2', '0', 'v2', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(103, 'k3', '0', 'v3', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(104, 'k1', '0', 'v1-1', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(103, 'k1', '0', 'v1', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(103, 'k2', '0', 'v2', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(103, 'k3', '0', 'v3', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(104, 'k1', '0', 'v1-1', '', 'apollo', 'apollo'); INSERT INTO `grayreleaserule` (`AppId`, `ClusterName`, `NamespaceName`, `BranchName`, `Rules`, `ReleaseId`, `BranchStatus`)VALUES ('test', 'default2', 'application', 'child-cluster2', '[]', 1155, 1); @@ -59,9 +59,9 @@ INSERT INTO `cluster` (ID, `Name`, `AppId`, `ParentClusterId`, `IsDeleted`, `Dat INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(105, 'test', 'default3', 'application', 0, 'apollo', 'apollo'); INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(106, 'test', 'child-cluster3', 'application', 0, 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(105, 'k1', '0', 'v1', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(105, 'k2', '0', 'v2-2', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(106, 'k1', '0', 'v1-2', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(105, 'k1', '0', 'v1', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(105, 'k2', '0', 'v2-2', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(106, 'k1', '0', 'v1-2', '', 'apollo', 'apollo'); INSERT INTO `release` (`Id`, `ReleaseKey`, `Name`, `Comment`, `AppId`, `ClusterName`, `NamespaceName`, `Configurations`, `IsAbandoned`)VALUES(1, '20160823102253-fc0071ddf9fd3260', '20160823101703-release', '', 'test', 'default3', 'application', '{"k1":"v1","k2":"v2","k3":"v3"}', 0); INSERT INTO `release` (`Id`, `ReleaseKey`, `Name`, `Comment`, `AppId`, `ClusterName`, `NamespaceName`, `Configurations`, `IsAbandoned`)VALUES(2, '20160823102253-fc0071ddf9fd3260', '20160823101703-release', '', 'test', 'child-cluster3', 'application', '{"k1":"v1-1","k2":"v2","k3":"v3"}', 0); @@ -75,10 +75,10 @@ INSERT INTO `cluster` (ID, `Name`, `AppId`, `ParentClusterId`, `IsDeleted`, `Dat INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(107, 'test', 'default4', 'application', 0, 'apollo', 'apollo'); INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(108, 'test', 'child-cluster4', 'application', 0, 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(107, 'k1', '0', 'v1', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(107, 'k2', '0', 'v2-2', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(108, 'k1', '0', 'v1-2', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(108, 'k4', '0', 'v4', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(107, 'k1', '0', 'v1', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(107, 'k2', '0', 'v2-2', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(108, 'k1', '0', 'v1-2', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(108, 'k4', '0', 'v4', '', 'apollo', 'apollo'); INSERT INTO `release` (`Id`, `ReleaseKey`, `Name`, `Comment`, `AppId`, `ClusterName`, `NamespaceName`, `Configurations`, `IsAbandoned`)VALUES(3, '20160823102253-fc0071ddf9fd3260', '20160823101703-release', '', 'test', 'default4', 'application', '{"k1":"v1","k2":"v2","k3":"v3"}', 0); @@ -91,11 +91,11 @@ INSERT INTO `cluster` (ID, `Name`, `AppId`, `ParentClusterId`, `IsDeleted`, `Dat INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(109, 'test', 'default5', 'application', 0, 'apollo', 'apollo'); INSERT INTO `namespace` (ID, `AppId`, `ClusterName`, `NamespaceName`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(1010, 'test', 'child-cluster5', 'application', 0, 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(109, 'k1', '0', 'v1', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(109, 'k2', '0', 'v2-2', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(1010, 'k1', '0', 'v1-2', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(1010, 'k4', '0', 'v4', '', 'apollo', 'apollo'); -INSERT INTO `item` (`NamespaceId`, `Key`, `Type`, `Value`, `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(1010, 'k6', '0', 'v6', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(109, 'k1', '0', 'v1', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(109, 'k2', '0', 'v2-2', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(1010, 'k1', '0', 'v1-2', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(1010, 'k4', '0', 'v4', '', 'apollo', 'apollo'); +INSERT INTO `item` (`NamespaceId`, "Key", "Type", "Value", `Comment`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)VALUES(1010, 'k6', '0', 'v6', '', 'apollo', 'apollo'); INSERT INTO `release` (`Id`, `ReleaseKey`, `Name`, `Comment`, `AppId`, `ClusterName`, `NamespaceName`, `Configurations`, `IsAbandoned`)VALUES(4, '20160823102253-fc0071ddf9fd3260', '20160823101703-release', '', 'test', 'default5', 'application', '{"k1":"v1","k2":"v2","k3":"v3"}', 0); INSERT INTO `release` (`Id`, `ReleaseKey`, `Name`, `Comment`, `AppId`, `ClusterName`, `NamespaceName`, `Configurations`, `IsAbandoned`)VALUES(5, '20160823102253-fc0071ddf9fd3260', '20160823101703-release', '', 'test', 'child-cluster5', 'application', '{"k1":"v1-1","k2":"v2","k3":"v3","k4":"v4","k5":"v5"}', 0); diff --git a/apollo-configservice/src/test/resources/application.properties b/apollo-configservice/src/test/resources/application.properties index a96d38b5180..c181f354dab 100644 --- a/apollo-configservice/src/test/resources/application.properties +++ b/apollo-configservice/src/test/resources/application.properties @@ -16,7 +16,7 @@ spring.cloud.consul.enabled=false spring.cloud.zookeeper.enabled=false -spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1 +spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1;BUILTIN_ALIAS_OVERRIDE=TRUE spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl spring.jpa.hibernate.globally_quoted_identifiers=false diff --git a/apollo-configservice/src/test/resources/data.sql b/apollo-configservice/src/test/resources/data.sql index fccb99563ba..bc6674f8909 100644 --- a/apollo-configservice/src/test/resources/data.sql +++ b/apollo-configservice/src/test/resources/data.sql @@ -40,10 +40,9 @@ INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (3, '100003 INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (4, '100003173', 'default', 'application'); INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (5, '100003171', 'default', 'application'); -INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k1', 'v1', 'comment1'); -INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k2', 'v2', 'comment2'); -INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (2, 'k3', 'v3', 'comment3'); -INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (5, 'k3', 'v4', 'comment4'); +INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (1, 'k1', 'v1', 'comment1'); +INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (1, 'k2', 'v2', 'comment2'); +INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (2, 'k3', 'v3', 'comment3'); +INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (5, 'k3', 'v4', 'comment4'); INSERT INTO RELEASE (ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES ('TEST-RELEASE-KEY', 'REV1','First Release','100003171', 'default', 'application', '{"k1":"v1"}'); - diff --git a/apollo-configservice/src/test/resources/import.sql b/apollo-configservice/src/test/resources/import.sql index afd2dd89066..a238396b7db 100644 --- a/apollo-configservice/src/test/resources/import.sql +++ b/apollo-configservice/src/test/resources/import.sql @@ -13,4 +13,33 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common.jpa.H2Function.unixTimestamp"; \ No newline at end of file +ALTER TABLE APP ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE APP ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE APP ALTER COLUMN ORGNAME VARCHAR(255) NULL; +ALTER TABLE APP ALTER COLUMN ORGID VARCHAR(255) NULL; +ALTER TABLE Cluster ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Cluster ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Cluster ALTER COLUMN ParentClusterId BIGINT DEFAULT 0; +ALTER TABLE Namespace ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Namespace ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Item ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Item ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE RELEASE ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE RELEASE ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE ServerConfig ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE ServerConfig ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE ServerConfig ALTER COLUMN COMMENT VARCHAR(255) NULL; +ALTER TABLE Audit ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Audit ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE GrayReleaseRule ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE GrayReleaseRule ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE RELEASE ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE RELEASE ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Item ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Item ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Namespace ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Namespace ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE AppNamespace ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE AppNamespace ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE AppNamespace ALTER COLUMN Format VARCHAR(255) NULL; +CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common.jpa.H2Function.unixTimestamp"; diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/ServerConfig.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/ServerConfig.java index 27fb0a18b8c..aa75ac3a5d3 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/ServerConfig.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/ServerConfig.java @@ -35,11 +35,11 @@ @Where(clause = "isDeleted = 0") public class ServerConfig extends BaseEntity { @NotBlank(message = "ServerConfig.Key cannot be blank") - @Column(name = "Key", nullable = false) + @Column(name = "`Key`", nullable = false) private String key; @NotBlank(message = "ServerConfig.Value cannot be blank") - @Column(name = "Value", nullable = false) + @Column(name = "`Value`", nullable = false) private String value; @Column(name = "Comment", nullable = false) diff --git a/apollo-portal/src/test/resources/application.properties b/apollo-portal/src/test/resources/application.properties index 2811617703f..c08db5700cf 100644 --- a/apollo-portal/src/test/resources/application.properties +++ b/apollo-portal/src/test/resources/application.properties @@ -17,7 +17,7 @@ spring.cloud.consul.enabled=false spring.cloud.zookeeper.enabled=false spring.cloud.discovery.enabled=false -spring.datasource.url = jdbc:h2:mem:~/apolloportaldb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1 +spring.datasource.url = jdbc:h2:mem:~/apolloportaldb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1;BUILTIN_ALIAS_OVERRIDE=TRUE spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl spring.jpa.hibernate.globally_quoted_identifiers=false diff --git a/apollo-portal/src/test/resources/import.sql b/apollo-portal/src/test/resources/import.sql index afd2dd89066..55b95c1f8d9 100644 --- a/apollo-portal/src/test/resources/import.sql +++ b/apollo-portal/src/test/resources/import.sql @@ -13,4 +13,23 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common.jpa.H2Function.unixTimestamp"; \ No newline at end of file +ALTER TABLE Consumer ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Consumer ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE ConsumerToken ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE ConsumerToken ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE ConsumerRole ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE ConsumerRole ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Role ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Role ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE UserRole ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE UserRole ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE Permission ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE Permission ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE RolePermission ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE RolePermission ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE AppNamespace ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL; +ALTER TABLE AppNamespace ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE AppNamespace ALTER COLUMN Format VARCHAR(255) NULL; +ALTER TABLE APP ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL; +ALTER TABLE ServerConfig ALTER COLUMN COMMENT VARCHAR(255) NULL; +CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common.jpa.H2Function.unixTimestamp"; diff --git a/pom.xml b/pom.xml index b385619c186..047c86d93a0 100644 --- a/pom.xml +++ b/pom.xml @@ -176,12 +176,6 @@ 1.4.20 - - com.h2database - h2 - 1.4.191 - test - org.awaitility awaitility