Add import for time related types

scalar-labs · Jan 10, 2025 · c6999af · c6999af
1 parent f851464
commit c6999af
Show file tree

Hide file tree

Showing 46 changed files with 1,312 additions and 319 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -413,7 +413,7 @@ jobs:
     steps:
       - name: Run MySQL 5.7
         run: |
-          docker run -e MYSQL_ROOT_PASSWORD=mysql -p 3306:3306 -d mysql:5.7 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
+          docker run -e MYSQL_ROOT_PASSWORD=mysql -p 3306:3306 -d mysql:5.7 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --explicit-defaults-for-timestamp
 
       - uses: actions/checkout@v4
 

diff --git a/...calar/db/storage/jdbc/ConsensusCommitAdminImportTableIntegrationTestWithJdbcDatabase.java b/...calar/db/storage/jdbc/ConsensusCommitAdminImportTableIntegrationTestWithJdbcDatabase.java
@@ -1,10 +1,10 @@
 package com.scalar.db.storage.jdbc;
 
-import com.scalar.db.api.TableMetadata;
+import com.scalar.db.api.DistributedStorageAdminImportTableIntegrationTestBase.TestData;
 import com.scalar.db.exception.storage.ExecutionException;
 import com.scalar.db.transaction.consensuscommit.ConsensusCommitAdminImportTableIntegrationTestBase;
 import java.sql.SQLException;
-import java.util.Map;
+import java.util.List;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
@@ -44,8 +44,7 @@ public void afterAll() {
   }
 
   @Override
-  protected Map<String, TableMetadata> createExistingDatabaseWithAllDataTypes()
-      throws SQLException {
+  protected List<TestData> createExistingDatabaseWithAllDataTypes() throws SQLException {
     return testUtils.createExistingDatabaseWithAllDataTypes(getNamespace());
   }
 

diff --git a/...integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminImportTableIntegrationTest.java b/...integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminImportTableIntegrationTest.java
@@ -1,10 +1,9 @@
 package com.scalar.db.storage.jdbc;
 
 import com.scalar.db.api.DistributedStorageAdminImportTableIntegrationTestBase;
-import com.scalar.db.api.TableMetadata;
 import com.scalar.db.exception.storage.ExecutionException;
 import java.sql.SQLException;
-import java.util.Map;
+import java.util.List;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
@@ -44,8 +43,7 @@ public void afterAll() {
   }
 
   @Override
-  protected Map<String, TableMetadata> createExistingDatabaseWithAllDataTypes()
-      throws SQLException {
+  protected List<TestData> createExistingDatabaseWithAllDataTypes() throws SQLException {
     return testUtils.createExistingDatabaseWithAllDataTypes(getNamespace());
   }