Add missing options to duplicated FK constraints (#671)

The new options in FK constraints (on update action, match type, etc.)
were missing from the duplication process. Thus, the options set
in the constraint disappeared after modifying columns with foreign
key constraints.

Author: kvch

pkg/migrations/duplicate.go

@@ -42,7 +42,6 @@ const (
 
 	cSetDefaultSQL                   = `ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s`
 	cAlterTableAddCheckConstraintSQL = `ALTER TABLE %s ADD CONSTRAINT %s %s NOT VALID`
-	cAlterTableAddForeignKeySQL      = `ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s) ON DELETE %s`
 )
 
 // NewColumnDuplicator creates a new Duplicator for a column.
@@ -190,14 +189,20 @@ func (d *duplicatorStmtBuilder) duplicateForeignKeyConstraints(withoutConstraint
 			continue
 		}
 		if duplicatedMember, constraintColumns := d.allConstraintColumns(fk.Columns, colNames...); duplicatedMember {
-			stmts = append(stmts, fmt.Sprintf(cAlterTableAddForeignKeySQL,
-				pq.QuoteIdentifier(d.table.Name),
-				pq.QuoteIdentifier(DuplicationName(fk.Name)),
-				strings.Join(quoteColumnNames(constraintColumns), ", "),
-				pq.QuoteIdentifier(fk.ReferencedTable),
-				strings.Join(quoteColumnNames(fk.ReferencedColumns), ", "),
-				fk.OnDelete,
-			))
+			sql := fmt.Sprintf("ALTER TABLE %s ADD ", pq.QuoteIdentifier(d.table.Name))
+			writer := ConstraintSQLWriter{
+				Name:    DuplicationName(fk.Name),
+				Columns: constraintColumns,
+			}
+			sql += writer.WriteForeignKey(
+				fk.ReferencedTable,
+				fk.ReferencedColumns,
+				ForeignKeyAction(fk.OnDelete),
+				ForeignKeyAction(fk.OnUpdate),
+				fk.OnDeleteSetColumns,
+				ForeignKeyMatchType(fk.MatchType),
+			)
+			stmts = append(stmts, sql)
 		}
 	}
 	return stmts

pkg/migrations/duplicate_test.go

@@ -34,7 +34,7 @@ var table = &schema.Table{
 	},
 	ForeignKeys: map[string]*schema.ForeignKey{
 		"fk_city":      {Name: "fk_city", Columns: []string{"city"}, ReferencedTable: "cities", ReferencedColumns: []string{"id"}, OnDelete: "NO ACTION"},
-		"fk_name_nick": {Name: "fk_name_nick", Columns: []string{"name", "nick"}, ReferencedTable: "users", ReferencedColumns: []string{"name", "nick"}, OnDelete: "CASCADE"},
+		"fk_name_nick": {Name: "fk_name_nick", Columns: []string{"name", "nick"}, ReferencedTable: "users", ReferencedColumns: []string{"name", "nick"}, OnDelete: "CASCADE", OnUpdate: "CASCADE", MatchType: "FULL"},
 	},
 	Indexes: map[string]*schema.Index{
 		"idx_no_kate": {
@@ -115,30 +115,30 @@ func TestDuplicateStmtBuilderForeignKeyConstraints(t *testing.T) {
 		"single-column FK with single column duplicated": {
 			columns: []string{"city"},
 			expectedStmts: []string{
-				`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_city" FOREIGN KEY ("_pgroll_new_city") REFERENCES "cities" ("id") ON DELETE NO ACTION`,
+				`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_city" FOREIGN KEY ("_pgroll_new_city") REFERENCES "cities" ("id") MATCH SIMPLE ON DELETE NO ACTION ON UPDATE NO ACTION`,
 			},
 		},
 		"single-column FK with multiple columns duplicated": {
 			columns: []string{"city", "description"},
 			expectedStmts: []string{
-				`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_city" FOREIGN KEY ("_pgroll_new_city") REFERENCES "cities" ("id") ON DELETE NO ACTION`,
+				`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_city" FOREIGN KEY ("_pgroll_new_city") REFERENCES "cities" ("id") MATCH SIMPLE ON DELETE NO ACTION ON UPDATE NO ACTION`,
 			},
 		},
 		"multi-column FK with single column duplicated": {
 			columns: []string{"name"},
 			expectedStmts: []string{
-				`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_name_nick" FOREIGN KEY ("_pgroll_new_name", "nick") REFERENCES "users" ("name", "nick") ON DELETE CASCADE`,
+				`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_name_nick" FOREIGN KEY ("_pgroll_new_name", "nick") REFERENCES "users" ("name", "nick") MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE`,
 			},
 		},
 		"multi-column FK with multiple unrelated column duplicated": {
 			columns: []string{"name", "description"},
 			expectedStmts: []string{
-				`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_name_nick" FOREIGN KEY ("_pgroll_new_name", "nick") REFERENCES "users" ("name", "nick") ON DELETE CASCADE`,
+				`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_name_nick" FOREIGN KEY ("_pgroll_new_name", "nick") REFERENCES "users" ("name", "nick") MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE`,
 			},
 		},
 		"multi-column FK with multiple columns": {
 			columns:       []string{"name", "nick"},
-			expectedStmts: []string{`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_name_nick" FOREIGN KEY ("_pgroll_new_name", "_pgroll_new_nick") REFERENCES "users" ("name", "nick") ON DELETE CASCADE`},
+			expectedStmts: []string{`ALTER TABLE "test_table" ADD CONSTRAINT "_pgroll_dup_fk_name_nick" FOREIGN KEY ("_pgroll_new_name", "_pgroll_new_nick") REFERENCES "users" ("name", "nick") MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE`},
 		},
 	} {
 		t.Run(name, func(t *testing.T) {

pkg/schema/schema.go

@@ -132,6 +132,9 @@ type ForeignKey struct {
 	// The ON DELETE behavior of the foreign key
 	OnDelete string `json:"onDelete"`
 
+	// OnDeleteSetColumns is the list of columns to update ON DELETE
+	OnDeleteSetColumns []string `json:"onDeleteSetColumns"`
+
 	// The ON UPDATE behavior of the foreign key
 	OnUpdate string `json:"onUpdate"`