0006413: DBImport should have option to adjust

create.index.convert.unique.to.nonunique.when.columns.not.required param
JumpMind · May 8, 2024 · 25eb9d4 · 25eb9d4
1 parent af22c09
commit 25eb9d4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DbImport.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DbImport.java
@@ -95,6 +95,7 @@ public enum Format {
     private boolean alterTables = false;
     private boolean dropIfExists = false;
     private boolean ignoreMissingTables = true;
+    private boolean createIndexConvertUniqueToNonuniqueWhenColumnsNotRequired = true;
     protected IDatabasePlatform symmetricPlatform;
     protected List<IDatabaseWriterFilter> databaseWriterFilters;
 
@@ -179,6 +180,7 @@ protected DatabaseWriterSettings buildDatabaseWriterSettings() {
         settings.setDatabaseWriterFilters(databaseWriterFilters);
         settings.setIgnoreMissingTables(ignoreMissingTables);
         settings.setCreateTableAlterCaseToMatchDatabaseDefault(alterCaseToMatchDatabaseDefaultCase);
+        settings.setCreateIndexConvertUniqueToNonuniqueWhenColumnsNotRequired(createIndexConvertUniqueToNonuniqueWhenColumnsNotRequired);
         if (forceImport) {
             settings.addErrorHandler(new DatabaseWriterErrorIgnorer());
         }
@@ -264,6 +266,14 @@ public boolean isIgnoreMissingTables() {
         return ignoreMissingTables;
     }
 
+    public void setCreateIndexConvertUniqueToNonuniqueWhenColumnsNotRequired(boolean createIndexConvertUniqueToNonuniqueWhenColumnsNotRequired) {
+        this.createIndexConvertUniqueToNonuniqueWhenColumnsNotRequired = createIndexConvertUniqueToNonuniqueWhenColumnsNotRequired;
+    }
+
+    public boolean isCreateIndexConvertUniqueToNonuniqueWhenColumnsNotRequired() {
+        return createIndexConvertUniqueToNonuniqueWhenColumnsNotRequired;
+    }
+
     public boolean isUseVariableDates() {
         return useVariableDates;
     }

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbImportDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbImportDialog.java
@@ -75,6 +75,7 @@ enum DbImportFormat {
     private Checkbox ignoreConflicts;
     private Checkbox ignoreMissingTables;
     private Checkbox replace;
+    private Checkbox convertUniIndexes;
     private ComboBox<String> schemaSelect;
     private ComboBox<String> catalogSelect;
     private ComboBox<String> listOfTablesSelect;
@@ -185,6 +186,9 @@ protected void createImportLayout() {
         formLayout.add(ignoreMissingTables);
         replace = new Checkbox("Replace rows with conflicts");
         formLayout.add(replace);
+        convertUniIndexes = new Checkbox("Convert unique indexes to non-unique when one of the columns is defined as not required");
+        convertUniIndexes.setValue(true);
+        formLayout.add(convertUniIndexes);
         alter = new Checkbox("Alter existing tables, if needed");
         alter.setEnabled(false);
         alter.setValue(true);
@@ -271,6 +275,7 @@ protected void createDbImport() {
         dbImport.setIgnoreMissingTables(ignoreMissingTables.getValue());
         dbImport.setAlterTables(alter.getValue());
         dbImport.setAlterCaseToMatchDatabaseDefaultCase(alterCase.getValue());
+        dbImport.setCreateIndexConvertUniqueToNonuniqueWhenColumnsNotRequired(convertUniIndexes.getValue());
     }
 
     protected boolean importButtonEnable() {