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.

Sign up for GitHub

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

Handle unconvertible CREATE TABLE column defintions #548

Merged
merged 3 commits into from
Dec 18, 2024
+34 −0
Merged

Handle unconvertible CREATE TABLE column defintions #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b423eef
Fall back to raw SQL for `STORAGE` options
andrew-farries Dec 18, 2024
a80d716
Fall back to raw SQL for `COMPRESSION` options
andrew-farries Dec 18, 2024
3d33a39
Fall back to raw SQL for `COLLATE` options
andrew-farries Dec 18, 2024
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
25 changes: 25 additions & 0 deletions pkg/sql2pgroll/create_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ func convertCreateStmt(stmt *pgq.CreateStmt) (migrations.Operations, error) {
if err != nil {
return nil, fmt.Errorf("error converting column definition: %w", err)
}
if column == nil {
return nil, nil
}
columns = append(columns, *column)
default:
return nil, nil
Expand Down Expand Up @@ -80,6 +83,10 @@ func canConvertCreateStatement(stmt *pgq.CreateStmt) bool {
}

func convertColumnDef(col *pgq.ColumnDef) (*migrations.Column, error) {
if !canConvertColumnDef(col) {
return nil, nil
}

// Convert the column type
typeString, err := pgq.DeparseTypeName(col.TypeName)
if err != nil {
Expand Down Expand Up @@ -111,3 +118,21 @@ func convertColumnDef(col *pgq.ColumnDef) (*migrations.Column, error) {
Pk: pk,
}, nil
}

// canConvertColumnDef returns true iff `col` can be converted to a pgroll
// `Column` definition.
func canConvertColumnDef(col *pgq.ColumnDef) bool {
switch {
// Column storage options are not supported
case col.GetStorageName() != "":
return false
// Column compression options are not supported
case col.GetCompression() != "":
return false
// Column collation options are not supported
case col.GetCollClause() != nil:
return false
default:
return true
}
}
9 changes: 9 additions & 0 deletions pkg/sql2pgroll/create_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@ func TestUnconvertableCreateTableStatements(t *testing.T) {
// The LIKE clause is not supported
"CREATE TABLE foo(a int, LIKE bar)",
"CREATE TABLE foo(LIKE bar)",

// Column `STORAGE` options are not supported
"CREATE TABLE foo(a int STORAGE PLAIN)",

// Column compression options are not supported
"CREATE TABLE foo(a text COMPRESSION pglz)",

// Column collation is not supported
"CREATE TABLE foo(a text COLLATE en_US)",
}

for _, sql := range tests {
Expand Down