fix Priority issues for snapshot generators (#142)

* fix: change priority method to ignore databases that are not databricks
liquibase · Jun 10, 2024 · 02d85e9 · 02d85e9
1 parent cccb862
commit 02d85e9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 25 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/src/main/java/liquibase/ext/databricks/snapshot/jvm/SequenceSnapshotGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/snapshot/jvm/SequenceSnapshotGeneratorDatabricks.java
@@ -1,28 +1,26 @@
 package liquibase.ext.databricks.snapshot.jvm;
 
-import liquibase.CatalogAndSchema;
 import liquibase.Scope;
-import liquibase.database.AbstractJdbcDatabase;
 import liquibase.database.Database;
 import liquibase.exception.DatabaseException;
 import liquibase.ext.databricks.database.DatabricksDatabase;
 import liquibase.snapshot.DatabaseSnapshot;
 import liquibase.snapshot.SnapshotGenerator;
 import liquibase.snapshot.jvm.SequenceSnapshotGenerator;
-import liquibase.structure.DatabaseObject;
-import liquibase.structure.core.Schema;
 import liquibase.statement.SqlStatement;
 import liquibase.statement.core.RawSqlStatement;
+import liquibase.structure.DatabaseObject;
+import liquibase.structure.core.Schema;
 
 public class SequenceSnapshotGeneratorDatabricks extends SequenceSnapshotGenerator {
 
  @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
@@ -42,10 +40,6 @@ protected SqlStatement getSelectSequenceStatement(Schema schema, Database databa
  if (database instanceof DatabricksDatabase) {
  // Databricks does not support sequences
 
- CatalogAndSchema catalogAndSchema = (new CatalogAndSchema(schema.getCatalogName(), schema.getName())).customize(database);
-
- String jdbcSchemaName = database.correctObjectName(((AbstractJdbcDatabase)database).getJdbcSchemaName(catalogAndSchema), Schema.class);
-
  String databricksSequenceSql = "SELECT NULL AS SEQUENCE_NAME, NULL AS START_VALUE, NULL AS MIN_VALUE, NULL AS MAX_VALUE, NULL AS INCREMENT_BY, NULL AS WILL_CYCLE " +
  "FROM " + schema.getCatalogName() + ".information_schema.columns " +
  "WHERE " +

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