Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preserve comments on column duplication #323

Merged
merged 3 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions pkg/migrations/duplicate.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func (d *Duplicator) Duplicate(ctx context.Context) error {
cAddForeignKeySQL = `ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s) ON DELETE %s`
cAddCheckConstraintSQL = `ADD CONSTRAINT %s %s NOT VALID`
cCreateUniqueIndexSQL = `CREATE UNIQUE INDEX CONCURRENTLY %s ON %s (%s)`
cCommentOnColumnSQL = `COMMENT ON COLUMN %s.%s IS %s`
)

// Generate SQL to duplicate the column's name and type
Expand Down Expand Up @@ -116,6 +117,20 @@ func (d *Duplicator) Duplicate(ctx context.Context) error {
return err
}

// Generate SQL to duplicate the column's comment
if d.column.Comment != "" {
sql = fmt.Sprintf(cCommentOnColumnSQL,
pq.QuoteIdentifier(d.table.Name),
pq.QuoteIdentifier(d.asName),
pq.QuoteLiteral(d.column.Comment),
)

_, err = d.conn.ExecContext(ctx, sql)
if err != nil {
return err
}
}

// Generate SQL to duplicate any unique constraints on the column
// The constraint is duplicated by adding a unique index on the column concurrently.
// The index is converted into a unique constraint on migration completion.
Expand Down
47 changes: 47 additions & 0 deletions pkg/migrations/op_change_type_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,53 @@ func TestChangeColumnType(t *testing.T) {
})
},
},
{
name: "changing column type preserves any comments on the column",
migrations: []migrations.Migration{
{
Name: "01_add_table",
Operations: migrations.Operations{
&migrations.OpCreateTable{
Name: "users",
Columns: []migrations.Column{
{
Name: "id",
Type: "serial",
Pk: ptr(true),
},
{
Name: "username",
Type: "text",
Comment: ptr("the name of the user"),
},
},
},
},
},
{
Name: "02_change_type",
Operations: migrations.Operations{
&migrations.OpAlterColumn{
Table: "users",
Column: "username",
Type: ptr("varchar(255)"),
Up: ptr("username"),
Down: ptr("username"),
},
},
},
},
afterStart: func(t *testing.T, db *sql.DB, schema string) {
// The duplicated column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "users", migrations.TemporaryName("username"), "the name of the user")
},
afterRollback: func(t *testing.T, db *sql.DB, schema string) {
},
afterComplete: func(t *testing.T, db *sql.DB, schema string) {
// The final column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "users", "username", "the name of the user")
},
},
})
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/migrations/op_common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ func columnHasType(t *testing.T, db *sql.DB, schema, table, column, expectedType
func columnHasComment(t *testing.T, db *sql.DB, schema, table, column, expectedComment string) bool {
t.Helper()

var actualComment string
var actualComment *string
err := db.QueryRow(fmt.Sprintf(`
SELECT col_description(
%[1]s::regclass,
Expand All @@ -497,7 +497,7 @@ func columnHasComment(t *testing.T, db *sql.DB, schema, table, column, expectedC
t.Fatal(err)
}

return expectedComment == actualComment
return actualComment != nil && *actualComment == expectedComment
}

func tableHasComment(t *testing.T, db *sql.DB, schema, table, expectedComment string) bool {
Expand Down
49 changes: 49 additions & 0 deletions pkg/migrations/op_drop_constraint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,55 @@ func TestDropConstraint(t *testing.T) {
}, testutils.NotNullViolationErrorCode)
},
},
{
name: "dropping a unique constraint preserves any comment on the column",
migrations: []migrations.Migration{
{
Name: "01_add_table",
Operations: migrations.Operations{
&migrations.OpCreateTable{
Name: "posts",
Columns: []migrations.Column{
{
Name: "id",
Type: "serial",
Pk: ptr(true),
},
{
Name: "title",
Type: "text",
Unique: ptr(true),
Nullable: ptr(false),
Comment: ptr("the title of the post"),
},
},
},
},
},
{
Name: "02_drop_unique_constraint",
Operations: migrations.Operations{
&migrations.OpDropConstraint{
Table: "posts",
Column: "title",
Name: "_pgroll_new_posts_title_key",
Up: "title",
Down: "title",
},
},
},
},
afterStart: func(t *testing.T, db *sql.DB, schema string) {
// The duplicated column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "posts", migrations.TemporaryName("title"), "the title of the post")
},
afterRollback: func(t *testing.T, db *sql.DB, schema string) {
},
afterComplete: func(t *testing.T, db *sql.DB, schema string) {
// The final column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "posts", "title", "the title of the post")
},
},
})
}

Expand Down
48 changes: 48 additions & 0 deletions pkg/migrations/op_drop_not_null_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,54 @@ func TestDropNotNull(t *testing.T) {
})
},
},
{
name: "dropping not null retains any comments defined on the column",
migrations: []migrations.Migration{
{
Name: "01_add_table",
Operations: migrations.Operations{
&migrations.OpCreateTable{
Name: "users",
Columns: []migrations.Column{
{
Name: "id",
Type: "serial",
Pk: ptr(true),
},
{
Name: "name",
Type: "text",
Nullable: ptr(false),
Comment: ptr("the name of the user"),
},
},
},
},
},
{
Name: "02_set_not_null",
Operations: migrations.Operations{
&migrations.OpAlterColumn{
Table: "users",
Column: "name",
Nullable: ptr(true),
Up: ptr("name"),
Down: ptr("(SELECT CASE WHEN name IS NULL THEN 'anonymous' ELSE name END)"),
},
},
},
},
afterStart: func(t *testing.T, db *sql.DB, schema string) {
// The duplicated column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "users", migrations.TemporaryName("name"), "the name of the user")
},
afterRollback: func(t *testing.T, db *sql.DB, schema string) {
},
afterComplete: func(t *testing.T, db *sql.DB, schema string) {
// The final column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "users", "name", "the name of the user")
},
},
})
}

Expand Down
50 changes: 50 additions & 0 deletions pkg/migrations/op_set_check_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,56 @@ func TestSetCheckConstraint(t *testing.T) {
})
},
},
{
name: "comments are preserved when adding a check constraint",
migrations: []migrations.Migration{
{
Name: "01_add_table",
Operations: migrations.Operations{
&migrations.OpCreateTable{
Name: "posts",
Columns: []migrations.Column{
{
Name: "id",
Type: "serial",
Pk: ptr(true),
},
{
Name: "title",
Type: "text",
Comment: ptr("the title of the post"),
},
},
},
},
},
{
Name: "02_add_check_constraint",
Operations: migrations.Operations{
&migrations.OpAlterColumn{
Table: "posts",
Column: "title",
Check: &migrations.CheckConstraint{
Name: "check_title_length",
Constraint: "length(title) > 3",
},
Up: ptr("(SELECT CASE WHEN length(title) <= 3 THEN LPAD(title, 4, '-') ELSE title END)"),
Down: ptr("title"),
},
},
},
},
afterStart: func(t *testing.T, db *sql.DB, schema string) {
// The duplicated column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "posts", migrations.TemporaryName("title"), "the title of the post")
},
afterRollback: func(t *testing.T, db *sql.DB, schema string) {
},
afterComplete: func(t *testing.T, db *sql.DB, schema string) {
// The final column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "posts", "title", "the title of the post")
},
},
})
}

Expand Down
69 changes: 69 additions & 0 deletions pkg/migrations/op_set_fk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,75 @@ func TestSetForeignKey(t *testing.T) {
})
},
},
{
name: "comments are preserved when adding a foreign key constraint",
migrations: []migrations.Migration{
{
Name: "01_add_tables",
Operations: migrations.Operations{
&migrations.OpCreateTable{
Name: "users",
Columns: []migrations.Column{
{
Name: "id",
Type: "serial",
Pk: ptr(true),
},
{
Name: "name",
Type: "text",
},
},
},
&migrations.OpCreateTable{
Name: "posts",
Columns: []migrations.Column{
{
Name: "id",
Type: "serial",
Pk: ptr(true),
},
{
Name: "title",
Type: "text",
},
{
Name: "user_id",
Type: "integer",
Comment: ptr("the id of the author"),
},
},
},
},
},
{
Name: "02_add_fk_constraint",
Operations: migrations.Operations{
&migrations.OpAlterColumn{
Table: "posts",
Column: "user_id",
References: &migrations.ForeignKeyReference{
Name: "fk_users_id",
Table: "users",
Column: "id",
},
Up: ptr("(SELECT CASE WHEN EXISTS (SELECT 1 FROM users WHERE users.id = user_id) THEN user_id ELSE NULL END)"),
Down: ptr("user_id"),
},
},
},
},
afterStart: func(t *testing.T, db *sql.DB, schema string) {
// The duplicated column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "posts", migrations.TemporaryName("user_id"), "the id of the author")
},
afterRollback: func(t *testing.T, db *sql.DB, schema string) {
},
afterComplete: func(t *testing.T, db *sql.DB, schema string) {
// The final column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "posts", "user_id", "the id of the author")
},
},
})
}

Expand Down
47 changes: 47 additions & 0 deletions pkg/migrations/op_set_notnull_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,53 @@ func TestSetNotNull(t *testing.T) {
})
},
},
{
name: "setting a column to not null retains any comment defined on the column",
migrations: []migrations.Migration{
{
Name: "01_add_table",
Operations: migrations.Operations{
&migrations.OpCreateTable{
Name: "users",
Columns: []migrations.Column{
{
Name: "id",
Type: "serial",
Pk: ptr(true),
},
{
Name: "name",
Type: "text",
Nullable: ptr(true),
Comment: ptr("the name of the user"),
},
},
},
},
},
{
Name: "02_set_not_null",
Operations: migrations.Operations{
&migrations.OpAlterColumn{
Table: "users",
Column: "name",
Nullable: ptr(false),
Up: ptr("(SELECT CASE WHEN name IS NULL THEN 'anonymous' ELSE name END)"),
},
},
},
},
afterStart: func(t *testing.T, db *sql.DB, schema string) {
// The duplicated column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "users", migrations.TemporaryName("name"), "the name of the user")
},
afterRollback: func(t *testing.T, db *sql.DB, schema string) {
},
afterComplete: func(t *testing.T, db *sql.DB, schema string) {
// The final column has a comment defined on it
ColumnMustHaveComment(t, db, schema, "users", "name", "the name of the user")
},
},
})
}

Expand Down
Loading