diff --git a/src/main/java/liquibase/ext/databricks/diff/output/changelog/MissingTableChangeGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/diff/output/changelog/MissingTableChangeGeneratorDatabricks.java index b123a70..e8ffe43 100644 --- a/src/main/java/liquibase/ext/databricks/diff/output/changelog/MissingTableChangeGeneratorDatabricks.java +++ b/src/main/java/liquibase/ext/databricks/diff/output/changelog/MissingTableChangeGeneratorDatabricks.java @@ -31,8 +31,9 @@ public Change[] fixMissing(DatabaseObject missingObject, DiffOutputControl contr if (changes == null || changes.length == 0) { return changes; } + //so far we intentionally omit tableLocation in generated changelog ExtendedTableProperties extendedTableProperties = new ExtendedTableProperties( - missingObject.getAttribute("Location", String.class), + null, missingObject.getAttribute("tblProperties", String.class)); changes[0] = getCreateTableChangeDatabricks(extendedTableProperties, changes); diff --git a/src/main/java/liquibase/ext/databricks/snapshot/jvm/TableSnapshotGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/snapshot/jvm/TableSnapshotGeneratorDatabricks.java index c2d33a9..cb5339e 100644 --- a/src/main/java/liquibase/ext/databricks/snapshot/jvm/TableSnapshotGeneratorDatabricks.java +++ b/src/main/java/liquibase/ext/databricks/snapshot/jvm/TableSnapshotGeneratorDatabricks.java @@ -43,16 +43,12 @@ protected DatabaseObject snapshotObject(DatabaseObject example, DatabaseSnapshot // DESCRIBE TABLE EXTENDED returns both columns and additional information. // We need to make sure "Location" is not column in the table, but table location in s3 boolean detailedInformationNode = false; - boolean externalLocation = false; for (Map tableProperty : tablePropertiesResponse) { if (tableProperty.get("COL_NAME").equals(DETAILED_TABLE_INFORMATION_NODE)) { detailedInformationNode = true; continue; } - if(detailedInformationNode && tableProperty.get("COL_NAME").equals(TYPE)) { - externalLocation = ((String)tableProperty.get("DATA_TYPE")).equalsIgnoreCase(EXTERNAL); - } - if (detailedInformationNode && externalLocation && tableProperty.get("COL_NAME").equals(LOCATION)) { + if (detailedInformationNode && tableProperty.get("COL_NAME").equals(LOCATION)) { table.setAttribute(LOCATION, tableProperty.get("DATA_TYPE")); } if (detailedInformationNode && tableProperty.get("COL_NAME").equals(TABLE_PROPERTIES)) {