fix: change priority method to ignore databases that are not databricks

liquibase · Jun 7, 2024 · 5ccabc7 · 5ccabc7
1 parent 6c369d0
commit 5ccabc7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/...ain/java/liquibase/ext/databricks/snapshot/jvm/ForeignKeySnapshotGeneratorDatabricks.java b/...ain/java/liquibase/ext/databricks/snapshot/jvm/ForeignKeySnapshotGeneratorDatabricks.java
@@ -40,6 +40,15 @@ public class ForeignKeySnapshotGeneratorDatabricks extends ForeignKeySnapshotGen
     public static final String METADATA_DELETE_RULE = "DELETE_RULE";
 
 
+    @Override
+    public int getPriority(Class<? extends DatabaseObject> objectType, Database database) {
+        if (database instanceof DatabricksDatabase) {
+            return super.getPriority(objectType, database) + PRIORITY_DATABASE;
+        } else {
+            return PRIORITY_NONE;
+        }
+    }
+
     @Override
     public Class<? extends SnapshotGenerator>[] replaces() {
         return new Class[]{ForeignKeySnapshotGenerator.class};
@@ -289,4 +298,4 @@ private boolean driverUsesSpFkeys(Database database) throws DatabaseException {
         }
     }
 
-}
+}
diff --git a/...n/java/liquibase/ext/databricks/snapshot/jvm/ResultSetConstraintsExtractorDatabricks.java b/...n/java/liquibase/ext/databricks/snapshot/jvm/ResultSetConstraintsExtractorDatabricks.java
@@ -5,12 +5,11 @@
 import liquibase.database.Database;
 import liquibase.exception.DatabaseException;
 import liquibase.snapshot.CachedRow;
-import liquibase.snapshot.DatabaseSnapshot;;
+import liquibase.snapshot.DatabaseSnapshot;
 import liquibase.structure.core.Schema;
 
 import java.sql.SQLException;
 import java.util.List;
-import liquibase.ext.databricks.snapshot.jvm.ResultSetCacheDatabricks;
 
 public class ResultSetConstraintsExtractorDatabricks extends ResultSetCacheDatabricks.SingleResultSetExtractor {
 
@@ -79,4 +78,4 @@ private String createSql(String catalog, String schema, String table) {
 
         return sql;
     }
-}
+}
diff --git a/...va/liquibase/ext/databricks/snapshot/jvm/UniqueConstraintSnapshotGeneratorDatabricks.java b/...va/liquibase/ext/databricks/snapshot/jvm/UniqueConstraintSnapshotGeneratorDatabricks.java
@@ -20,11 +20,11 @@ public class UniqueConstraintSnapshotGeneratorDatabricks extends UniqueConstrain
 
     @Override
     public int getPriority(Class<? extends DatabaseObject> objectType, Database database) {
-        int priority = super.getPriority(objectType, database);
-        if (priority > PRIORITY_NONE && database instanceof DatabricksDatabase) {
-            priority += DatabricksDatabase.DATABRICKS_PRIORITY_DATABASE;
+        if (database instanceof DatabricksDatabase) {
+            return super.getPriority(objectType, database) + PRIORITY_DATABASE;
+        } else {
+            return PRIORITY_NONE;
         }
-        return priority;
     }
 
     @Override
@@ -62,4 +62,4 @@ protected List<CachedRow> listConstraints(Table table, DatabaseSnapshot snapshot
         }
 
         return Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", database).queryForList(new RawSqlStatement(sql));
-    }}
+    }}
diff --git a/src/main/java/liquibase/ext/databricks/snapshot/jvm/ViewSnapshotGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/snapshot/jvm/ViewSnapshotGeneratorDatabricks.java
@@ -27,11 +27,11 @@ public class ViewSnapshotGeneratorDatabricks extends ViewSnapshotGenerator {
 
     @Override
     public int getPriority(Class<? extends DatabaseObject> objectType, Database database) {
-        int priority = super.getPriority(objectType, database);
-        if (priority > PRIORITY_NONE && database instanceof DatabricksDatabase) {
-            priority += DatabricksDatabase.DATABRICKS_PRIORITY_DATABASE;
+        if (database instanceof DatabricksDatabase) {
+            return super.getPriority(objectType, database) + PRIORITY_DATABASE;
+        } else {
+            return PRIORITY_NONE;
         }
-        return priority;
     }
 
     @Override