0002018: Translate sql server's getdate() function to current_timesta…

…mp when used as a default value in building ddl for other platforms
JumpMind · Oct 17, 2014 · 8b2ac6c · 8b2ac6c
1 parent 59fce92
commit 8b2ac6c
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java
@@ -868,12 +868,26 @@ protected Collection<Column> readColumns(DatabaseMetaDataWrapper metaData, Strin
                     columnNames.add(column.getName());
                     columns.add(column);
                 }
+
+                generizizeDefaultValuesAndUpdatePlatformColumn(column);
             }
             return columns;
         } finally {
             close(columnData);
         }
     }
+
+    protected void generizizeDefaultValuesAndUpdatePlatformColumn(Column column) {
+        PlatformColumn platformColumn = column.findPlatformColumn(platform.getName());
+        platformColumn.setDefaultValue(column.getDefaultValue());
+
+        /*
+         * Translate from platform specific functions to ansi sql functions
+         */
+        if ("getdate()".equalsIgnoreCase(column.getDefaultValue())) {
+            column.setDefaultValue("CURRENT_TIMESTAMP");
+        }
+    }
 
     protected Integer mapUnknownJdbcTypeForColumn(Map<String, Object> values) {
         return null;
@@ -902,15 +916,7 @@ protected Column readColumn(DatabaseMetaDataWrapper metaData, Map<String, Object
         }
         if (defaultValue != null) {
             defaultValue = defaultValue.trim();
-            platformColumn.setDefaultValue(defaultValue);
-
-            /*
-             * Translate from platform specific functions to ansi sql functions
-             */
-            if ("getdate()".equalsIgnoreCase(defaultValue)) {
-                defaultValue = "CURRENT_TIMESTAMP";
-            }
-            column.setDefaultValue(defaultValue.trim());
+            column.setDefaultValue(defaultValue);
         }
 
         String typeName = (String) values.get("TYPE_NAME");