0003216: Tibero Database Dialect

JumpMind · Aug 3, 2017 · 384472b · 384472b
1 parent 893892b
commit 384472b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/tibero/TiberoDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/tibero/TiberoDdlBuilder.java
@@ -44,25 +44,25 @@ public TiberoDdlBuilder() {
         databaseInfo.addNativeTypeMapping(Types.ARRAY, "BLOB", Types.BLOB);
         databaseInfo.addNativeTypeMapping(Types.BIGINT, "NUMBER(38)");
         databaseInfo.addNativeTypeMapping(Types.BINARY, "RAW", Types.VARBINARY);
-        databaseInfo.addNativeTypeMapping(Types.BIT, "NUMBER(1)", Types.NUMERIC);
+        databaseInfo.addNativeTypeMapping(Types.BIT, "NUMBER(1)", Types.DECIMAL);
         databaseInfo.addNativeTypeMapping(Types.DATE, "DATE", Types.TIMESTAMP);
-        databaseInfo.addNativeTypeMapping(Types.NUMERIC, "NUMBER");
+        databaseInfo.addNativeTypeMapping(Types.DECIMAL, "NUMBER", Types.NUMERIC);
         databaseInfo.addNativeTypeMapping(Types.DISTINCT, "BLOB", Types.BLOB);
         databaseInfo.addNativeTypeMapping(Types.DOUBLE, "DOUBLE PRECISION");
         databaseInfo.addNativeTypeMapping(Types.FLOAT, "FLOAT", Types.DOUBLE);
         databaseInfo.addNativeTypeMapping(Types.JAVA_OBJECT, "BLOB", Types.BLOB);
         databaseInfo.addNativeTypeMapping(Types.LONGVARBINARY, "BLOB", Types.BLOB);
         databaseInfo.addNativeTypeMapping(Types.LONGVARCHAR, "CLOB", Types.CLOB);
         databaseInfo.addNativeTypeMapping(Types.NULL, "BLOB", Types.BLOB);
-        databaseInfo.addNativeTypeMapping(Types.DECIMAL, "NUMBER", Types.NUMERIC);
-        databaseInfo.addNativeTypeMapping(Types.INTEGER, "NUMBER(22)", Types.NUMERIC);
+        databaseInfo.addNativeTypeMapping(Types.NUMERIC, "NUMBER", Types.DECIMAL);
+        databaseInfo.addNativeTypeMapping(Types.INTEGER, "NUMBER(22)", Types.DECIMAL);
         databaseInfo.addNativeTypeMapping(Types.OTHER, "BLOB", Types.BLOB);
         databaseInfo.addNativeTypeMapping(Types.REF, "BLOB", Types.BLOB);
         databaseInfo.addNativeTypeMapping(Types.SMALLINT, "NUMBER(5)");
         databaseInfo.addNativeTypeMapping(Types.STRUCT, "BLOB", Types.BLOB);
         databaseInfo.addNativeTypeMapping(Types.TIME, "DATE", Types.DATE);
         databaseInfo.addNativeTypeMapping(Types.TIMESTAMP, "TIMESTAMP");
-        databaseInfo.addNativeTypeMapping(Types.TINYINT, "NUMBER(3)", Types.NUMERIC);
+        databaseInfo.addNativeTypeMapping(Types.TINYINT, "NUMBER(3)", Types.DECIMAL);
         databaseInfo.addNativeTypeMapping(Types.VARBINARY, "RAW");
         databaseInfo.addNativeTypeMapping(Types.VARCHAR, "VARCHAR2");
         databaseInfo.addNativeTypeMapping("BOOLEAN", "NUMBER(1)", "BIT");

diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/tibero/TiberoDdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/tibero/TiberoDdlReader.java
@@ -143,23 +143,27 @@ protected Column readColumn(DatabaseMetaDataWrapper metaData, Map<String, Object
         Column column = super.readColumn(metaData, values);
         if (column.getMappedTypeCode() == Types.NUMERIC) {
             PlatformColumn platformColumn = column.getPlatformColumns().get(platform.getName());
-            if (platformColumn.getDecimalDigits() == 0 && column.getSizeAsInt() == 15) {
-                column.setSize("15");
-            }
+            //if (platformColumn.getDecimalDigits() == 0 && column.getSizeAsInt() == 15) {
+            //    column.setSize("15");
+            //}
             if (column.getScale() == 0) {
-
                 if (column.getSizeAsInt() == 3) {
                     column.setMappedTypeCode(Types.TINYINT);
                 } else if (column.getSizeAsInt() <= 22) {
                     column.setMappedTypeCode(Types.INTEGER);
                 } else if (column.getSizeAsInt() == 38) {
                     column.setMappedTypeCode(Types.BIGINT);
-                }  else if (column.getSizeAsInt() <= 63) {
+                }
+            } 
+            /*
+            else {
+                if (column.getSizeAsInt() <= 63) {
                     column.setMappedTypeCode(Types.REAL);
                 } else {
                     column.setMappedTypeCode(Types.DOUBLE);
                 }
-            }
+            }*/
+
         } else if (column.getMappedTypeCode() == Types.FLOAT) {
             // Same for REAL, FLOAT, DOUBLE PRECISION, which all back-map to
             // FLOAT but with