0000766: dbimport of timestamp column doesn't support 'default' for O…

…racle (maybe others)
JumpMind · Aug 9, 2012 · 5294471 · 5294471
1 parent 4a4445e
commit 5294471
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/model/Column.java b/symmetric-db/src/main/java/org/jumpmind/db/model/Column.java
@@ -465,9 +465,9 @@ public Object getParsedDefaultValue() {
                         break;
                 }
             } catch (NumberFormatException ex) {
-                return defaultValue;
+                return null;
             } catch (IllegalArgumentException ex) {
-                return defaultValue;
+                return null;
             }
         }
         return defaultValue;

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java
@@ -1826,7 +1826,10 @@ protected void writeColumnDefaultValueStmt(Table table, Column column, StringBui
                 ddl.append(" DEFAULT ");
                 writeColumnDefaultValue(table, column, ddl);
             }
-        } else if (databaseInfo.isDefaultValueUsedForIdentitySpec() && column.isAutoIncrement()) {
+        } else if (databaseInfo.isDefaultValueUsedForIdentitySpec() && column.isAutoIncrement()) { // here?
+            ddl.append(" DEFAULT ");
+            writeColumnDefaultValue(table, column, ddl);
+        } else if (!StringUtils.isBlank(column.getDefaultValue())) {
             ddl.append(" DEFAULT ");
             writeColumnDefaultValue(table, column, ddl);
         }