fix unit tests

apolloconfig · Feb 27, 2023 · b7c00b2 · b7c00b2
1 parent 680812a
commit b7c00b2
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 3 deletions.
diff --git a/apollo-adminservice/src/test/resources/controller/test-release.sql b/apollo-adminservice/src/test/resources/controller/test-release.sql
@@ -23,4 +23,4 @@ INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (100, 'some
 
 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');
+INSERT INTO Item (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k3', '0', 'v3', 'comment1');
diff --git 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;BUILTIN_ALIAS_OVERRIDE=TRUE;
+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-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
@@ -13,4 +13,23 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
+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/apollo-portal/src/test/resources/sql/permission/insert-test-consumerroles.sql b/apollo-portal/src/test/resources/sql/permission/insert-test-consumerroles.sql
@@ -13,6 +13,8 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
+ALTER TABLE ConsumerRole ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE ConsumerRole ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
 INSERT INTO `consumerrole` (`Id`, `ConsumerId`, `RoleId`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)
   VALUES (890, 1, 990, 'someOperator', 'someOperator');
 INSERT INTO `consumerrole` (`Id`, `ConsumerId`, `RoleId`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)

diff --git a/apollo-portal/src/test/resources/sql/permission/insert-test-permissions.sql b/apollo-portal/src/test/resources/sql/permission/insert-test-permissions.sql
@@ -13,5 +13,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
+ALTER TABLE Permission ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE Permission ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
 INSERT INTO `permission` (`Id`, `PermissionType`, `TargetId`) VALUES (990, 'somePermissionType', 'someTargetId');
 INSERT INTO `permission` (`Id`, `PermissionType`, `TargetId`) VALUES (991, 'anotherPermissionType', 'anotherTargetId');
diff --git a/apollo-portal/src/test/resources/sql/permission/insert-test-rolepermissions.sql b/apollo-portal/src/test/resources/sql/permission/insert-test-rolepermissions.sql
@@ -13,5 +13,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
+ALTER TABLE RolePermission ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE RolePermission ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
 INSERT INTO `rolepermission` (`Id`, `RoleId`, `PermissionId`) VALUES (990, 990, 990);
 INSERT INTO `rolepermission` (`Id`, `RoleId`, `PermissionId`) VALUES (991, 990, 991);
diff --git a/apollo-portal/src/test/resources/sql/permission/insert-test-roles.sql b/apollo-portal/src/test/resources/sql/permission/insert-test-roles.sql
@@ -13,5 +13,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
+ALTER TABLE Role ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE Role ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
 INSERT INTO `role` (`Id`, `RoleName`) VALUES (990, 'someRoleName');
 INSERT INTO `role` (`Id`, `RoleName`) VALUES (991, 'anotherRoleName');
diff --git a/apollo-portal/src/test/resources/sql/permission/insert-test-userroles.sql b/apollo-portal/src/test/resources/sql/permission/insert-test-userroles.sql
@@ -13,6 +13,8 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
+ALTER TABLE UserRole ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE UserRole ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
 INSERT INTO `userrole` (`Id`, `UserId`, `RoleId`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)
   VALUES (990, 'someUser', 990, 'someOperator', 'someOperator');
 INSERT INTO `userrole` (`Id`, `UserId`, `RoleId`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)