0001782: initial.load.create.first fails for tables with a unique ind…

…ex on the primary key
JumpMind · Jun 27, 2014 · 3693ccf · 3693ccf
1 parent 1a5c58b
commit 3693ccf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
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
@@ -1199,12 +1199,13 @@ protected void createTable(Table table, StringBuilder ddl, boolean temporary, bo
         writeTableCreationStmt(table, ddl);
         writeTableCreationStmtEnding(table, ddl);
 
-        if (!databaseInfo.isPrimaryKeyEmbedded()) {
-            writeExternalPrimaryKeysCreateStmt(table, table.getPrimaryKeyColumns(), ddl);
-        }
         if (!databaseInfo.isIndicesEmbedded()) {
             writeExternalIndicesCreateStmt(table, ddl);
         }
+
+        if (!databaseInfo.isPrimaryKeyEmbedded()) {
+            writeExternalPrimaryKeysCreateStmt(table, table.getPrimaryKeyColumns(), ddl);
+        }
     }
 
     /**

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlBuilder.java
@@ -95,6 +95,7 @@ public OracleDdlBuilder() {
         databaseInfo.setDefaultSize(Types.BINARY, 254);
         databaseInfo.setDefaultSize(Types.VARBINARY, 254);
 
+        databaseInfo.setPrimaryKeyEmbedded(false);
         databaseInfo.setDateOverridesToTimestamp(true);
         databaseInfo.setNonBlankCharColumnSpacePadded(true);
         databaseInfo.setBlankCharColumnSpacePadded(true);