0000676: dbimport fails to create unique indexes

JumpMind · Jun 28, 2012 · 5fd106d · 5fd106d
1 parent 346549a
commit 5fd106d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/DbImport.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/DbImport.java
@@ -57,6 +57,8 @@ public enum Format { SQL, CSV, XML };
     private boolean useVariableDates;
 
     private boolean alterCaseToMatchDatabaseDefaultCase = false;
+
+    private boolean failOnError = false;
 
     private IDatabasePlatform platform;
 
@@ -118,7 +120,7 @@ protected void importTablesFromCsv(InputStream in, String tableName) throws IOEx
 
     protected void importTablesFromXml(InputStream in) {
         Database database = platform.readDatabaseFromXml(in, alterCaseToMatchDatabaseDefaultCase);
-        platform.createDatabase(database, false, true);
+        platform.createDatabase(database, false, !failOnError);
 
         // TODO: read in data from XML also
     }
@@ -179,5 +181,13 @@ public void setAlterCaseToMatchDatabaseDefaultCase(boolean alterCaseToMatchDatab
     public boolean isAlterCaseToMatchDatabaseDefaultCase() {
         return alterCaseToMatchDatabaseDefaultCase;
     }
+
+    public void setFailOnError(boolean failOnError) {
+        this.failOnError = failOnError;
+    }
+
+    public boolean isFailOnError() {
+        return failOnError;
+    }
 
 }
diff --git a/symmetric/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseIO.java b/symmetric/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseIO.java
@@ -215,7 +215,7 @@ public Database read(Reader reader, boolean validate) throws DdlException {
                                 }
                             }
                             table.addIndex(index);
-                        } else if (name.equalsIgnoreCase("index-column")) {
+                        } else if (name.equalsIgnoreCase("index-column") || name.equalsIgnoreCase("unique-column")) {
                             IndexColumn indexColumn = new IndexColumn();
                             for (int i = 0; i < parser.getAttributeCount(); i++) {
                                 String attributeName = parser.getAttributeName(i);