Fix issue liquibase#3516 addColumn ignores deleteCascade=true

Handling of deleteCascade config added to AddColumnGenerator. Signed-off-by: Andrei Yusupau <andrei.yusupau@gmail.com>
andreiyusupau · Dec 17, 2023 · 6dd6bca · 6dd6bca
1 parent e605cee
commit 6dd6bca
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/liquibase-standard/src/main/java/liquibase/sqlgenerator/core/AddColumnGenerator.java b/liquibase-standard/src/main/java/liquibase/sqlgenerator/core/AddColumnGenerator.java
@@ -2,7 +2,16 @@
 
 import liquibase.change.ColumnConfig;
 import liquibase.database.Database;
-import liquibase.database.core.*;
+import liquibase.database.core.AbstractDb2Database;
+import liquibase.database.core.DerbyDatabase;
+import liquibase.database.core.H2Database;
+import liquibase.database.core.HsqlDatabase;
+import liquibase.database.core.MSSQLDatabase;
+import liquibase.database.core.MySQLDatabase;
+import liquibase.database.core.OracleDatabase;
+import liquibase.database.core.SQLiteDatabase;
+import liquibase.database.core.SybaseASADatabase;
+import liquibase.database.core.SybaseDatabase;
 import liquibase.datatype.DataTypeFactory;
 import liquibase.datatype.DatabaseDataType;
 import liquibase.exception.DatabaseException;
@@ -12,7 +21,11 @@
 import liquibase.sql.UnparsedSql;
 import liquibase.sqlgenerator.SqlGeneratorChain;
 import liquibase.sqlgenerator.SqlGeneratorFactory;
-import liquibase.statement.*;
+import liquibase.statement.AutoIncrementConstraint;
+import liquibase.statement.ColumnConstraint;
+import liquibase.statement.DatabaseFunction;
+import liquibase.statement.ForeignKeyConstraint;
+import liquibase.statement.NotNullConstraint;
 import liquibase.statement.core.AddColumnStatement;
 import liquibase.statement.core.AddForeignKeyConstraintStatement;
 import liquibase.statement.core.AddUniqueConstraintStatement;
@@ -254,6 +267,9 @@ protected void addForeignKeyStatements(AddColumnStatement statement, Database da
 
 
                 AddForeignKeyConstraintStatement addForeignKeyConstraintStatement = new AddForeignKeyConstraintStatement(fkConstraint.getForeignKeyName(), statement.getCatalogName(), statement.getSchemaName(), statement.getTableName(), ColumnConfig.arrayFromNames(statement.getColumnName()), null, refSchemaName, refTableName, ColumnConfig.arrayFromNames(refColName));
+                if (fkConstraint.isDeleteCascade()) {
+                    addForeignKeyConstraintStatement.setOnDelete("CASCADE");
+                }
                 addForeignKeyConstraintStatement.setShouldValidate(fkConstraint.shouldValidateForeignKey());
                 returnSql.addAll(Arrays.asList(SqlGeneratorFactory.getInstance().generateSql(addForeignKeyConstraintStatement, database)));
             }

diff --git a/liquibase-standard/src/test/groovy/liquibase/change/core/AddColumnChangeTest.groovy b/liquibase-standard/src/test/groovy/liquibase/change/core/AddColumnChangeTest.groovy
@@ -4,6 +4,7 @@ import liquibase.change.AddColumnConfig
 import liquibase.change.Change
 import liquibase.change.ChangeFactory
 import liquibase.change.ChangeStatus
+import liquibase.change.ConstraintsConfig
 import liquibase.change.StandardChangeTest
 import liquibase.change.visitor.ChangeVisitor
 import liquibase.change.visitor.ChangeVisitorFactory
@@ -372,4 +373,27 @@ class AddColumnChangeTest extends StandardChangeTest {
             }
         }
     }
+
+    def "columns with delete cascade generate expected sql"() {
+        when:
+        def db = new PostgresDatabase()
+
+        def change = new AddColumnChange()
+        change.setTableName("test_table")
+
+        def constraintsConfig = new ConstraintsConfig()
+        constraintsConfig.setForeignKeyName("test_fk")
+        constraintsConfig.setReferencedColumnNames("ref_col")
+        constraintsConfig.setReferencedTableName("ref_table")
+        constraintsConfig.setDeleteCascade(true)
+        change.addColumn(new AddColumnConfig()
+                .setName("test_column")
+                .setType('BIGINT')
+                .setConstraints(constraintsConfig))
+
+        def statements = change.generateStatements(db)
+
+        then:
+        SqlGeneratorFactory.getInstance().generateSql(statements, db)*.toString() == ["ALTER TABLE test_table ADD test_column BIGINT;", "ALTER TABLE test_table ADD CONSTRAINT test_fk FOREIGN KEY (test_column) REFERENCES ref_table (ref_col) ON DELETE CASCADE;"]
+    }
 }