Fix error message of column rename (#292)

xataio · Feb 29, 2024 · 0aebb50 · 0aebb50
1 parent 0746ba6
commit 0aebb50
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 21 deletions.
diff --git a/pkg/migrations/op_rename_column.go b/pkg/migrations/op_rename_column.go
@@ -43,7 +43,7 @@ func (o *OpRenameColumn) Validate(ctx context.Context, s *schema.Schema) error {
 	table := s.GetTable(o.Table)
 
 	if table.GetColumn(o.To) != nil {
-		return ColumnAlreadyExistsError{Table: o.Table, Name: o.From}
+		return ColumnAlreadyExistsError{Table: o.Table, Name: o.To}
 	}
 
 	return nil

diff --git a/pkg/migrations/op_rename_column_test.go b/pkg/migrations/op_rename_column_test.go
@@ -13,29 +13,31 @@ import (
 func TestRenameColumn(t *testing.T) {
 	t.Parallel()
 
-	ExecuteTests(t, TestCases{{
-		name: "rename 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:     "varchar(255)",
-								Nullable: ptr(false),
-							},
-						},
+	addTableMigration := 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:     "varchar(255)",
+						Nullable: ptr(false),
 					},
 				},
 			},
+		},
+	}
+
+	ExecuteTests(t, TestCases{{
+		name: "rename column",
+		migrations: []migrations.Migration{
+			addTableMigration,
 			{
 				Name: "02_rename_column",
 				Operations: migrations.Operations{
@@ -78,5 +80,21 @@ func TestRenameColumn(t *testing.T) {
 				{"id": 2, "name": "bob"},
 			}, rows)
 		},
+	}, {
+		name: "column must not exist",
+		migrations: []migrations.Migration{
+			addTableMigration,
+			{
+				Name: "02_rename_column",
+				Operations: migrations.Operations{
+					&migrations.OpAlterColumn{
+						Table:  "users",
+						Column: "username",
+						Name:   ptr("id"),
+					},
+				},
+			},
+		},
+		wantStartErr: migrations.ColumnAlreadyExistsError{Table: "users", Name: "id"},
 	}})
 }