DAT-19050: several more fixes, slightlu changed regex to not include …

…ending bracket, default value sql generator to omit wraping numeric values in columns.
liquibase · Nov 21, 2024 · 557045e · 557045e
1 parent 2d094f9
commit 557045e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/liquibase/ext/databricks/snapshot/jvm/ColumnSnapshotGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/snapshot/jvm/ColumnSnapshotGeneratorDatabricks.java
@@ -18,9 +18,9 @@
 public class ColumnSnapshotGeneratorDatabricks extends ColumnSnapshotGenerator {
 
     private static final String ALL_DATA_TYPES = " BIGINT | BINARY | BOOLEAN | DATE | DECIMAL| DECIMAL\\(| DOUBLE | FLOAT | INT | INTERVAL | VOID | SMALLINT | STRING | VARCHAR\\(\\d+\\) | TIMESTAMP | TIMESTAMP_NTZ | TINYINT | ARRAY<| MAP<| STRUCT<| VARIANT| OBJECT<";
-    private static final String DEFAULT_CLAUSE_TERMINATORS = "(?i)(\\s+COMMENT\\s+'| PRIMARY\\s+KEY | FOREIGN\\s+KEY | MASK\\s+\\w+|$|,(\\s+\\w+\\s+" + ALL_DATA_TYPES + "|\\)$)";
+    private static final String DEFAULT_CLAUSE_TERMINATORS = "(?i)(\\s+COMMENT\\s+'| PRIMARY\\s+KEY | FOREIGN\\s+KEY | MASK\\s+\\w+|$|,(\\s+\\w+\\s+" + ALL_DATA_TYPES + ")?|\\)$";
     private static final String GENERATED_BY_DEFAULT_REGEX = "(?i)\\s+GENERATED\\s+(BY\\s+DEFAULT|ALWAYS)\\s+AS\\s+IDENTITY";
-    private static final String GENERIC_DEFAULT_VALUE_REGEX = "DEFAULT\\s+(.*?)(" + DEFAULT_CLAUSE_TERMINATORS + "?))";
+    private static final String GENERIC_DEFAULT_VALUE_REGEX = "DEFAULT\\s+(.*?)(" + DEFAULT_CLAUSE_TERMINATORS + "))";
     private static final String SANITIZE_TABLE_SPECIFICATION_REGEX = "(\\(.*?\\))\\s*(?i)(USING|OPTIONS|PARTITIONED BY|CLUSTER BY|LOCATION|TBLPROPERTIES|WITH|$|;$)";
     private static final Pattern DEFAULT_VALUE_PATTERN = Pattern.compile(GENERIC_DEFAULT_VALUE_REGEX);
     private static final Pattern SANITIZE_TABLE_SPECIFICATION_PATTERN = Pattern.compile(SANITIZE_TABLE_SPECIFICATION_REGEX);
@@ -71,7 +71,7 @@ protected DatabaseObject snapshotObject(DatabaseObject example, DatabaseSnapshot
                 String showCreateTableStatement = (String) snapshot.getScratchData(showCreateRelatedTableQuery);
                 String defaultValue = extractDefaultValue(showCreateTableStatement, column.getName());
                 column.setAutoIncrementInformation(parseAutoIncrementInfo(showCreateTableStatement, column.getName()));
-                if (defaultValue != null) {
+                if (defaultValue != null && !defaultValue.equalsIgnoreCase("null")) {
                     Matcher functionMatcher = FUNCTION_PATTERN.matcher(defaultValue);
                     if (functionMatcher.find()) {
                         DatabaseFunction function = new DatabaseFunction(defaultValue);
@@ -103,7 +103,8 @@ private String extractDefaultValue(String createTableStatement, String columnNam
             Matcher defaultValueMatcher = DEFAULT_VALUE_PATTERN.matcher(columnWithPotentialDefault);
             if (defaultValueMatcher.find()) {
                 defaultValue = defaultValueMatcher.group(1);
-                if (stringColumnTypeMatcher.find() && defaultStringValueMatcher.find()) {
+                if (stringColumnTypeMatcher.find() && defaultStringValueMatcher.find()
+                        && (defaultValue.startsWith("'") || defaultValue.startsWith("\""))) {
                     defaultValue = defaultStringValueMatcher.group(2);
                 }
             }

diff --git a/src/main/java/liquibase/ext/databricks/sqlgenerator/AddDefaultValueGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/sqlgenerator/AddDefaultValueGeneratorDatabricks.java
@@ -13,7 +13,11 @@
 import liquibase.statement.core.AddDefaultValueStatement;
 import liquibase.sqlgenerator.core.AddDefaultValueGenerator;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class AddDefaultValueGeneratorDatabricks extends AddDefaultValueGenerator {
+    private static final List<String> NUMERIC_TYPES = Arrays.asList("TINYINT", "SMALLINT", "INT", "BIGINT", "FLOAT", "DOUBLE", "DECIMAL");
     @Override
     public int getPriority() {
         return PRIORITY_DATABASE;
@@ -40,11 +44,16 @@ public ValidationErrors validate(AddDefaultValueStatement addDefaultValueStateme
     @Override
     public Sql[] generateSql(AddDefaultValueStatement statement, Database database, SqlGeneratorChain sqlGeneratorChain) {
         Object defaultValue = statement.getDefaultValue();
+        String columnDataType = statement.getColumnDataType();
         String finalDefaultValue;
         if (defaultValue instanceof DatabaseFunction) {
             finalDefaultValue = defaultValue.toString();
         } else {
-            finalDefaultValue =  DataTypeFactory.getInstance().fromObject(defaultValue, database).objectToSql(defaultValue, database);
+            if(NUMERIC_TYPES.contains(columnDataType) && defaultValue instanceof String) {
+                finalDefaultValue = defaultValue.toString().replace("'", "").trim();
+            } else {
+                finalDefaultValue =  DataTypeFactory.getInstance().fromObject(defaultValue, database).objectToSql(defaultValue, database);
+            }
         }
         return new Sql[]{
                 new UnparsedSql("ALTER TABLE " + database.escapeTableName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName()) + " ALTER COLUMN " + database.escapeColumnName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName(), statement.getColumnName()) + " SET DEFAULT " + finalDefaultValue,