From b4dabe8511c6b97b809afa251b37a1f34e71c27b Mon Sep 17 00:00:00 2001 From: Ryan Slade Date: Thu, 12 Dec 2024 12:02:26 +0100 Subject: [PATCH 1/3] Convert DROP INDEX SQL to pgroll operation --- pkg/sql2pgroll/drop.go | 33 +++++++++++++++++++++- pkg/sql2pgroll/drop_test.go | 43 ++++++++++++++++++++++++++++- pkg/sql2pgroll/expect/drop_table.go | 13 +++++++++ 3 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 pkg/sql2pgroll/expect/drop_table.go diff --git a/pkg/sql2pgroll/drop.go b/pkg/sql2pgroll/drop.go index ed6596b2..b7dca4f6 100644 --- a/pkg/sql2pgroll/drop.go +++ b/pkg/sql2pgroll/drop.go @@ -12,8 +12,12 @@ import ( // convertDropStatement converts supported drop statements to pgroll operations func convertDropStatement(stmt *pgq.DropStmt) (migrations.Operations, error) { - if stmt.RemoveType == pgq.ObjectType_OBJECT_INDEX { + switch stmt.RemoveType { + case pgq.ObjectType_OBJECT_INDEX: return convertDropIndexStatement(stmt) + case pgq.ObjectType_OBJECT_TABLE: + return convertDropTableStatement(stmt) + } return nil, nil } @@ -46,3 +50,30 @@ func canConvertDropIndex(stmt *pgq.DropStmt) bool { } return true } + +// convertDropTableStatement converts simple DROP TABLE statements to pgroll operations +func convertDropTableStatement(stmt *pgq.DropStmt) (migrations.Operations, error) { + if !canConvertDropTable(stmt) { + return nil, nil + } + + items := stmt.GetObjects()[0].GetList().GetItems() + parts := make([]string, len(items)) + for i, item := range items { + parts[i] = item.GetString_().GetSval() + } + + return migrations.Operations{ + &migrations.OpDropTable{ + Name: strings.Join(parts, "."), + }, + }, nil +} + +// canConvertDropTable checks whether we can convert the statement without losing any information. +func canConvertDropTable(stmt *pgq.DropStmt) bool { + if stmt.Behavior == pgq.DropBehavior_DROP_CASCADE { + return false + } + return true +} diff --git a/pkg/sql2pgroll/drop_test.go b/pkg/sql2pgroll/drop_test.go index 52c415eb..7a6c1ba5 100644 --- a/pkg/sql2pgroll/drop_test.go +++ b/pkg/sql2pgroll/drop_test.go @@ -54,11 +54,52 @@ func TestDropIndexStatements(t *testing.T) { } } -func TestUnconvertableDropIndexStatements(t *testing.T) { +func TestDropTableStatements(t *testing.T) { + t.Parallel() + + tests := []struct { + sql string + expectedOp migrations.Operation + }{ + { + sql: "DROP TABLE foo", + expectedOp: expect.DropTableOp1, + }, + { + sql: "DROP TABLE foo RESTRICT", + expectedOp: expect.DropTableOp1, + }, + { + sql: "DROP TABLE IF EXISTS foo", + expectedOp: expect.DropTableOp1, + }, + { + sql: "DROP TABLE foo.bar", + expectedOp: expect.DropTableOp2, + }, + } + + for _, tc := range tests { + t.Run(tc.sql, func(t *testing.T) { + ops, err := sql2pgroll.Convert(tc.sql) + require.NoError(t, err) + + require.Len(t, ops, 1) + + assert.Equal(t, tc.expectedOp, ops[0]) + }) + } +} + +func TestUnconvertableDropStatements(t *testing.T) { t.Parallel() tests := []string{ + // Drop index "DROP INDEX foo CASCADE", + + // Drop table + "DROP TABLE foo CASCADE", } for _, sql := range tests { diff --git a/pkg/sql2pgroll/expect/drop_table.go b/pkg/sql2pgroll/expect/drop_table.go new file mode 100644 index 00000000..a5e58d6c --- /dev/null +++ b/pkg/sql2pgroll/expect/drop_table.go @@ -0,0 +1,13 @@ +package expect + +import ( + "github.com/xataio/pgroll/pkg/migrations" +) + +var DropTableOp1 = &migrations.OpDropTable{ + Name: "foo", +} + +var DropTableOp2 = &migrations.OpDropTable{ + Name: "foo.bar", +} From 687d95e7bf0e4fabad42944b51e369004099fc60 Mon Sep 17 00:00:00 2001 From: Ryan Slade Date: Thu, 12 Dec 2024 12:09:50 +0100 Subject: [PATCH 2/3] Add license header --- pkg/sql2pgroll/expect/drop_table.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/sql2pgroll/expect/drop_table.go b/pkg/sql2pgroll/expect/drop_table.go index a5e58d6c..90d6a25e 100644 --- a/pkg/sql2pgroll/expect/drop_table.go +++ b/pkg/sql2pgroll/expect/drop_table.go @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + package expect import ( From 91100cf03ca0d39ba7f284820c0a3fc5d671dd50 Mon Sep 17 00:00:00 2001 From: Ryan Slade Date: Thu, 12 Dec 2024 12:11:08 +0100 Subject: [PATCH 3/3] Simplify --- pkg/sql2pgroll/drop.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/sql2pgroll/drop.go b/pkg/sql2pgroll/drop.go index b7dca4f6..e6303f96 100644 --- a/pkg/sql2pgroll/drop.go +++ b/pkg/sql2pgroll/drop.go @@ -72,8 +72,5 @@ func convertDropTableStatement(stmt *pgq.DropStmt) (migrations.Operations, error // canConvertDropTable checks whether we can convert the statement without losing any information. func canConvertDropTable(stmt *pgq.DropStmt) bool { - if stmt.Behavior == pgq.DropBehavior_DROP_CASCADE { - return false - } - return true + return stmt.Behavior != pgq.DropBehavior_DROP_CASCADE }