test: use TgDataType in tableMetadate()

project-tsurugi · May 23, 2024 · 3c96af1 · 3c96af1
1 parent 441c5cd
commit 3c96af1
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbCharTest.java b/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbCharTest.java
@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
+import com.tsurugidb.iceaxe.sql.TgDataType;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindParameters;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariable;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariables;
@@ -19,7 +20,6 @@
 import com.tsurugidb.iceaxe.test.util.DbTestTableTester;
 import com.tsurugidb.iceaxe.transaction.manager.exception.TsurugiTmIOException;
 import com.tsurugidb.sql.proto.SqlCommon;
-import com.tsurugidb.sql.proto.SqlCommon.AtomType;
 import com.tsurugidb.tsubakuro.sql.SqlServiceCode;
 
 /**
@@ -71,13 +71,13 @@ void tableMetadate() throws Exception {
         var metadata = session.findTableMetadata(TEST).get();
         var list = metadata.getLowColumnList();
         assertEquals(2, list.size());
-        assertColumn("pk", AtomType.INT4, list.get(0));
-        assertColumn("value", AtomType.CHARACTER, list.get(1));
+        assertColumn("pk", TgDataType.INT, list.get(0));
+        assertColumn("value", TgDataType.STRING, list.get(1));
     }
 
-    private static void assertColumn(String name, AtomType type, SqlCommon.Column actual) {
+    private static void assertColumn(String name, TgDataType type, SqlCommon.Column actual) {
         assertEquals(name, actual.getName());
-        assertEquals(type, actual.getAtomType());
+        assertEquals(type.getLowDataType(), actual.getAtomType());
     }
 
     @Test

diff --git a/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbDateTest.java b/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbDateTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
+import com.tsurugidb.iceaxe.sql.TgDataType;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindParameters;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariable;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariables;
@@ -20,7 +21,6 @@
 import com.tsurugidb.iceaxe.test.util.DbTestTableTester;
 import com.tsurugidb.iceaxe.transaction.manager.exception.TsurugiTmIOException;
 import com.tsurugidb.sql.proto.SqlCommon;
-import com.tsurugidb.sql.proto.SqlCommon.AtomType;
 import com.tsurugidb.tsubakuro.sql.SqlServiceCode;
 
 /**
@@ -72,13 +72,13 @@ void tableMetadate() throws Exception {
         var metadata = session.findTableMetadata(TEST).get();
         var list = metadata.getLowColumnList();
         assertEquals(2, list.size());
-        assertColumn("pk", AtomType.INT4, list.get(0));
-        assertColumn("value", AtomType.DATE, list.get(1));
+        assertColumn("pk", TgDataType.INT, list.get(0));
+        assertColumn("value", TgDataType.DATE, list.get(1));
     }
 
-    private static void assertColumn(String name, AtomType type, SqlCommon.Column actual) {
+    private static void assertColumn(String name, TgDataType type, SqlCommon.Column actual) {
         assertEquals(name, actual.getName());
-        assertEquals(type, actual.getAtomType());
+        assertEquals(type.getLowDataType(), actual.getAtomType());
     }
 
     @Test

diff --git a/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbDecimal0Test.java b/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbDecimal0Test.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
+import com.tsurugidb.iceaxe.sql.TgDataType;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindParameters;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariable;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariables;
@@ -19,7 +20,6 @@
 import com.tsurugidb.iceaxe.sql.result.TsurugiResultEntity;
 import com.tsurugidb.iceaxe.test.util.DbTestTableTester;
 import com.tsurugidb.sql.proto.SqlCommon;
-import com.tsurugidb.sql.proto.SqlCommon.AtomType;
 
 /**
  * decimal(5,0) test
@@ -70,13 +70,13 @@ void tableMetadate() throws Exception {
         var metadata = session.findTableMetadata(TEST).get();
         var list = metadata.getLowColumnList();
         assertEquals(2, list.size());
-        assertColumn("pk", AtomType.INT4, list.get(0));
-        assertColumn("value", AtomType.DECIMAL, list.get(1));
+        assertColumn("pk", TgDataType.INT, list.get(0));
+        assertColumn("value", TgDataType.DECIMAL, list.get(1));
     }
 
-    private static void assertColumn(String name, AtomType type, SqlCommon.Column actual) {
+    private static void assertColumn(String name, TgDataType type, SqlCommon.Column actual) {
         assertEquals(name, actual.getName());
-        assertEquals(type, actual.getAtomType());
+        assertEquals(type.getLowDataType(), actual.getAtomType());
     }
 
     @Test

diff --git a/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbDecimal1Test.java b/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbDecimal1Test.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
+import com.tsurugidb.iceaxe.sql.TgDataType;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindParameters;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariable;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariables;
@@ -19,7 +20,6 @@
 import com.tsurugidb.iceaxe.sql.result.TsurugiResultEntity;
 import com.tsurugidb.iceaxe.test.util.DbTestTableTester;
 import com.tsurugidb.sql.proto.SqlCommon;
-import com.tsurugidb.sql.proto.SqlCommon.AtomType;
 
 /**
  * decimal(5,1) test
@@ -70,13 +70,13 @@ void tableMetadate() throws Exception {
         var metadata = session.findTableMetadata(TEST).get();
         var list = metadata.getLowColumnList();
         assertEquals(2, list.size());
-        assertColumn("pk", AtomType.INT4, list.get(0));
-        assertColumn("value", AtomType.DECIMAL, list.get(1));
+        assertColumn("pk", TgDataType.INT, list.get(0));
+        assertColumn("value", TgDataType.DECIMAL, list.get(1));
     }
 
-    private static void assertColumn(String name, AtomType type, SqlCommon.Column actual) {
+    private static void assertColumn(String name, TgDataType type, SqlCommon.Column actual) {
         assertEquals(name, actual.getName());
-        assertEquals(type, actual.getAtomType());
+        assertEquals(type.getLowDataType(), actual.getAtomType());
     }
 
     @Test

diff --git a/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbTimestampTest.java b/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbTimestampTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
+import com.tsurugidb.iceaxe.sql.TgDataType;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindParameters;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariable;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariables;
@@ -20,7 +21,6 @@
 import com.tsurugidb.iceaxe.test.util.DbTestTableTester;
 import com.tsurugidb.iceaxe.transaction.manager.exception.TsurugiTmIOException;
 import com.tsurugidb.sql.proto.SqlCommon;
-import com.tsurugidb.sql.proto.SqlCommon.AtomType;
 import com.tsurugidb.tsubakuro.sql.SqlServiceCode;
 
 /**
@@ -72,13 +72,13 @@ void tableMetadate() throws Exception {
         var metadata = session.findTableMetadata(TEST).get();
         var list = metadata.getLowColumnList();
         assertEquals(2, list.size());
-        assertColumn("pk", AtomType.INT4, list.get(0));
-        assertColumn("value", AtomType.TIME_POINT, list.get(1));
+        assertColumn("pk", TgDataType.INT, list.get(0));
+        assertColumn("value", TgDataType.DATE_TIME, list.get(1));
     }
 
-    private static void assertColumn(String name, AtomType type, SqlCommon.Column actual) {
+    private static void assertColumn(String name, TgDataType type, SqlCommon.Column actual) {
         assertEquals(name, actual.getName());
-        assertEquals(type, actual.getAtomType());
+        assertEquals(type.getLowDataType(), actual.getAtomType());
     }
 
     @Test

diff --git a/...s/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbTimestampTimeZoneTest.java b/...s/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbTimestampTimeZoneTest.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
+import com.tsurugidb.iceaxe.sql.TgDataType;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindParameters;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariable;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariables;
@@ -26,7 +27,6 @@
 import com.tsurugidb.iceaxe.test.util.DbTestTableTester;
 import com.tsurugidb.iceaxe.transaction.manager.exception.TsurugiTmIOException;
 import com.tsurugidb.sql.proto.SqlCommon;
-import com.tsurugidb.sql.proto.SqlCommon.AtomType;
 import com.tsurugidb.tsubakuro.sql.SqlServiceCode;
 
 /**
@@ -83,13 +83,13 @@ void tableMetadate() throws Exception {
         var metadata = session.findTableMetadata(TEST).get();
         var list = metadata.getLowColumnList();
         assertEquals(2, list.size());
-        assertColumn("pk", AtomType.INT4, list.get(0));
-        assertColumn("value", AtomType.TIME_POINT_WITH_TIME_ZONE, list.get(1));
+        assertColumn("pk", TgDataType.INT, list.get(0));
+        assertColumn("value", TgDataType.OFFSET_DATE_TIME, list.get(1));
     }
 
-    private static void assertColumn(String name, AtomType type, SqlCommon.Column actual) {
+    private static void assertColumn(String name, TgDataType type, SqlCommon.Column actual) {
         assertEquals(name, actual.getName());
-        assertEquals(type, actual.getAtomType());
+        assertEquals(type.getLowDataType(), actual.getAtomType());
     }
 
     @Test

diff --git a/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbVarcharTest.java b/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/type/DbVarcharTest.java
@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
+import com.tsurugidb.iceaxe.sql.TgDataType;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindParameters;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariable;
 import com.tsurugidb.iceaxe.sql.parameter.TgBindVariables;
@@ -19,7 +20,6 @@
 import com.tsurugidb.iceaxe.test.util.DbTestTableTester;
 import com.tsurugidb.iceaxe.transaction.manager.exception.TsurugiTmIOException;
 import com.tsurugidb.sql.proto.SqlCommon;
-import com.tsurugidb.sql.proto.SqlCommon.AtomType;
 import com.tsurugidb.tsubakuro.sql.SqlServiceCode;
 
 /**
@@ -71,13 +71,13 @@ void tableMetadate() throws Exception {
         var metadata = session.findTableMetadata(TEST).get();
         var list = metadata.getLowColumnList();
         assertEquals(2, list.size());
-        assertColumn("pk", AtomType.INT4, list.get(0));
-        assertColumn("value", AtomType.CHARACTER, list.get(1));
+        assertColumn("pk", TgDataType.INT, list.get(0));
+        assertColumn("value", TgDataType.STRING, list.get(1));
     }
 
-    private static void assertColumn(String name, AtomType type, SqlCommon.Column actual) {
+    private static void assertColumn(String name, TgDataType type, SqlCommon.Column actual) {
         assertEquals(name, actual.getName());
-        assertEquals(type, actual.getAtomType());
+        assertEquals(type.getLowDataType(), actual.getAtomType());
     }
 
     @Test