Skip to content

Commit 3b8c56e

Browse files
Rename and move test variables relating to sql2pgroll (#512)
* Rename the test variables to match their operation type. * Rename files to match the operation type. Part of #504
1 parent d94d3b4 commit 3b8c56e

File tree

5 files changed

+82
-74
lines changed

5 files changed

+82
-74
lines changed

pkg/sql2pgroll/alter_table_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@ func TestConvertAlterTableStatements(t *testing.T) {
2121
}{
2222
{
2323
sql: "ALTER TABLE foo ALTER COLUMN a SET NOT NULL",
24-
expectedOp: expect.AlterTableOp1,
24+
expectedOp: expect.AlterColumnOp1,
2525
},
2626
{
2727
sql: "ALTER TABLE foo ALTER COLUMN a DROP NOT NULL",
28-
expectedOp: expect.AlterTableOp2,
28+
expectedOp: expect.AlterColumnOp2,
2929
},
3030
{
3131
sql: "ALTER TABLE foo ALTER COLUMN a SET DATA TYPE text",
32-
expectedOp: expect.AlterTableOp3,
32+
expectedOp: expect.AlterColumnOp3,
3333
},
3434
{
3535
sql: "ALTER TABLE foo ALTER COLUMN a TYPE text",
36-
expectedOp: expect.AlterTableOp3,
36+
expectedOp: expect.AlterColumnOp3,
3737
},
3838
{
3939
sql: "ALTER TABLE foo ADD CONSTRAINT bar UNIQUE (a)",
40-
expectedOp: expect.AlterTableOp4,
40+
expectedOp: expect.CreateConstraintOp1,
4141
},
4242
{
4343
sql: "ALTER TABLE foo ADD CONSTRAINT bar UNIQUE (a, b)",
44-
expectedOp: expect.AlterTableOp5,
44+
expectedOp: expect.CreateConstraintOp2,
4545
},
4646
}
4747

pkg/sql2pgroll/expect/alter_column.go

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// SPDX-License-Identifier: Apache-2.0
2+
3+
package expect
4+
5+
import (
6+
"github.com/xataio/pgroll/pkg/migrations"
7+
"github.com/xataio/pgroll/pkg/sql2pgroll"
8+
)
9+
10+
var AlterColumnOp1 = &migrations.OpAlterColumn{
11+
Table: "foo",
12+
Column: "a",
13+
Nullable: ptr(false),
14+
Up: sql2pgroll.PlaceHolderSQL,
15+
Down: sql2pgroll.PlaceHolderSQL,
16+
}
17+
18+
var AlterColumnOp2 = &migrations.OpAlterColumn{
19+
Table: "foo",
20+
Column: "a",
21+
Nullable: ptr(true),
22+
Up: sql2pgroll.PlaceHolderSQL,
23+
Down: sql2pgroll.PlaceHolderSQL,
24+
}
25+
26+
var AlterColumnOp3 = &migrations.OpAlterColumn{
27+
Table: "foo",
28+
Column: "a",
29+
Type: ptr("text"),
30+
Up: sql2pgroll.PlaceHolderSQL,
31+
Down: sql2pgroll.PlaceHolderSQL,
32+
}
33+
34+
var AlterColumnOp4 = &migrations.OpAlterColumn{
35+
Table: "foo",
36+
Column: "a",
37+
Name: ptr("b"),
38+
}
39+
40+
func ptr[T any](v T) *T {
41+
return &v
42+
}

pkg/sql2pgroll/expect/alter_table.go

Lines changed: 0 additions & 66 deletions
This file was deleted.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// SPDX-License-Identifier: Apache-2.0
2+
3+
package expect
4+
5+
import (
6+
"github.com/xataio/pgroll/pkg/migrations"
7+
"github.com/xataio/pgroll/pkg/sql2pgroll"
8+
)
9+
10+
var CreateConstraintOp1 = &migrations.OpCreateConstraint{
11+
Type: migrations.OpCreateConstraintTypeUnique,
12+
Name: "bar",
13+
Table: "foo",
14+
Columns: []string{"a"},
15+
Down: map[string]string{"a": sql2pgroll.PlaceHolderSQL},
16+
Up: map[string]string{"a": sql2pgroll.PlaceHolderSQL},
17+
}
18+
19+
var CreateConstraintOp2 = &migrations.OpCreateConstraint{
20+
Type: migrations.OpCreateConstraintTypeUnique,
21+
Name: "bar",
22+
Table: "foo",
23+
Columns: []string{"a", "b"},
24+
Down: map[string]string{
25+
"a": sql2pgroll.PlaceHolderSQL,
26+
"b": sql2pgroll.PlaceHolderSQL,
27+
},
28+
Up: map[string]string{
29+
"a": sql2pgroll.PlaceHolderSQL,
30+
"b": sql2pgroll.PlaceHolderSQL,
31+
},
32+
}

pkg/sql2pgroll/rename_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ func TestConvertRenameColumnStatements(t *testing.T) {
2121
}{
2222
{
2323
sql: "ALTER TABLE foo RENAME COLUMN a TO b",
24-
expectedOp: expect.AlterTableOp6,
24+
expectedOp: expect.AlterColumnOp4,
2525
},
2626
{
2727
sql: "ALTER TABLE foo RENAME a TO b",
28-
expectedOp: expect.AlterTableOp6,
28+
expectedOp: expect.AlterColumnOp4,
2929
},
3030
}
3131

0 commit comments

Comments
 (0)