Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(oracle): missing comma before table-level constraints in schema dump (#20573)

rebeliceff948f0630aa
diff --git a/backend/plugin/schema/oracle/get_database_definition.go b/backend/plugin/schema/oracle/get_database_definition.go
index 2629830ad2..b6c2030635 100644
--- a/backend/plugin/schema/oracle/get_database_definition.go
+++ b/backend/plugin/schema/oracle/get_database_definition.go
@@ -187,13 +187,20 @@ func writeTable(buf *strings.Builder, table *storepb.TableMetadata) error {
if _, err := buf.WriteString("\" (\n"); err != nil {
return err
}
- for i, column := range table.Columns {
- if i > 0 {
+ itemCount := 0
+ writeSeparator := func() error {
+ if itemCount > 0 {
if _, err := buf.WriteString(",\n"); err != nil {
return err
}
}
- if _, err := buf.WriteString(` `); err != nil {
+ itemCount++
+ _, err := buf.WriteString(` `)
+ return err
+ }
+
+ for _, column := range table.Columns {
+ if err := writeSeparator(); err != nil {
return err
}
if err := writeColumn(buf, column); err != nil {
@@ -201,20 +208,11 @@ func writeTable(buf *strings.Builder, table *storepb.TableMetadata) error {
}
}
- constraints := []*storepb.IndexMetadata{}
for _, constraint := range table.Indexes {
- if constraint.IsConstraint {
- constraints = append(constraints, constraint)
- }
- }
-
- for i, constraint := range constraints {
- if i+len(table.Indexes) > 0 {
- if _, err := buf.WriteString(",\n"); err != nil {
- return err
- }
+ if !constraint.IsConstraint {
+ continue
}
- if _, err := buf.WriteString(` `); err != nil {
+ if err := writeSeparator(); err != nil {
return err
}
if err := writeConstraint(buf, constraint); err != nil {
@@ -222,13 +220,8 @@ func writeTable(buf *strings.Builder, table *storepb.TableMetadata) error {
}
}
- for i, check := range table.CheckConstraints {
- if i+len(table.Indexes)+len(constraints) > 0 {
- if _, err := buf.WriteString(",\n"); err != nil {
- return err
- }
- }
- if _, err := buf.WriteString(` `); err != nil {
+ for _, check := range table.CheckConstraints {
+ if err := writeSeparator(); err != nil {
return err
}
if err := writeCheckConstraint(buf, check); err != nil {
@@ -236,13 +229,8 @@ func writeTable(buf *strings.Builder, table *storepb.TableMetadata) error {
}
}
- for i, fk := range table.ForeignKeys {
- if i+len(table.Indexes)+len(constraints)+len(table.CheckConstraints) > 0 {
- if _, err := buf.WriteString(",\n"); err != nil {
- return err
- }
- }
- if _, err := buf.WriteString(` `); err != nil {
+ for _, fk := range table.ForeignKeys {
+ if err := writeSeparator(); err != nil {
return err
}
if err := writeForeignKey(buf, fk); err != nil {
diff --git a/backend/plugin/schema/oracle/get_database_definition_test.go b/backend/plugin/schema/oracle/get_database_definition_test.go
new file mode 100644
index 0000000000..755d191dba
--- /dev/null
+++ b/backend/plugin/schema/oracle/get_database_definition_test.go
@@ -0,0 +1,111 @@
+package oracle
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+)
+
+func TestGetTableDefinition(t *testing.T) {
+ tests := []struct {
+ name string
+ table *storepb.TableMetadata
+ want string
+ }{
+ {
+ // A table whose last column has DEFAULT + NOT NULL, followed by a
+ // table-level FOREIGN KEY with no other indexes or constraints.
+ // The FK must be separated from the column by a comma (ORA-02253).
+ name: "foreign key after default not null column without other constraints",
+ table: &storepb.TableMetadata{
+ Name: "T1",
+ Columns: []*storepb.ColumnMetadata{
+ {Name: "C1", Type: "NUMBER", Nullable: false},
+ {Name: "C2", Type: "NUMBER(1)", Default: "0", Nullable: false},
+ },
+ ForeignKeys: []*storepb.ForeignKeyMetadata{
+ {
+ Name: "T1_FK",
+ Columns: []string{"C1"},
+ ReferencedTable: "T2",
+ ReferencedColumns: []string{"C1"},
+ },
+ },
+ },
+ want: `CREATE TABLE "T1" (
+ "C1" NUMBER NOT NULL,
+ "C2" NUMBER(1) DEFAULT 0 NOT NULL,
+ CONSTRAINT "T1_FK" FOREIGN KEY ("C1") REFERENCES "T2" ("C1")
+);
+
+`,
+ },
+ {
+ name: "check constraint after column without other constraints",
+ table: &storepb.TableMetadata{
+ Name: "T1",
+ Columns: []*storepb.ColumnMetadata{
+ {Name: "C1", Type: "NUMBER", Nullable: false},
+ },
+ CheckConstraints: []*storepb.CheckConstraintMetadata{
+ {Name: "T1_CK", Expression: `"C1" > 0`},
+ },
+ },
+ want: `CREATE TABLE "T1" (
+ "C1" NUMBER NOT NULL,
+ CONSTRAINT "T1_CK" CHECK ("C1" > 0)
+);
+
+`,
+ },
+ {
+ name: "primary key, check, and foreign key",
+ table: &storepb.TableMetadata{
+ Name: "T1",
+ Columns: []*storepb.ColumnMetadata{
+ {Name: "C1", Type: "NUMBER", Nullable: false},
+ {Name: "C2", Type: "NUMBER(1)", Default: "0", Nullable: false},
+ },
+ Indexes: []*storepb.IndexMetadata{
+ {
+ Name: "T1_PK",
+ Expressions: []string{"C1"},
+ Primary: true,
+ Unique: true,
+ IsConstraint: true,
+ },
+ },
+ CheckConstraints: []*storepb.CheckConstraintMetadata{
+ {Name: "T1_CK", Expression: `"C2" IN (0, 1)`},
+ },
+ ForeignKeys: []*storepb.ForeignKeyMetadata{
+ {
+ Name: "T1_FK",
+ Columns: []string{"C1"},
+ ReferencedTable: "T2",
+ ReferencedColumns: []string{"C1"},
+ },
+ },
+ },
+ want: `CREATE TABLE "T1" (
+ "C1" NUMBER NOT NULL,
+ "C2" NUMBER(1) DEFAULT 0 NOT NULL,
+ CONSTRAINT "T1_PK" PRIMARY KEY ("C1"),
+ CONSTRAINT "T1_CK" CHECK ("C2" IN (0, 1)),
+ CONSTRAINT "T1_FK" FOREIGN KEY ("C1") REFERENCES "T2" ("C1")
+);
+
+`,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got, err := GetTableDefinition("", tt.table, nil)
+ require.NoError(t, err)
+ require.Equal(t, tt.want, got)
+ })
+ }
+}