Skip to content

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

chore: merge sequence into owner table file (#17858)

rebelice1c47388b3c9a
diff --git a/backend/plugin/schema/pg/get_database_definition.go b/backend/plugin/schema/pg/get_database_definition.go
index 9cf5c63643..d8d3d0fc5c 100644
--- a/backend/plugin/schema/pg/get_database_definition.go
+++ b/backend/plugin/schema/pg/get_database_definition.go
@@ -3174,7 +3174,8 @@ func GetMultiFileDatabaseDefinition(ctx schema.GetDefinitionContext, metadata *s
schemaName = "public"
}
- // Generate sequence files (standalone sequences only)
+ // Collect independent sequences (no owner) for this schema
+ var independentSequences []*storepb.SequenceMetadata
for _, sequence := range schemaMetadata.Sequences {
if sequence.SkipDump {
continue
@@ -3185,32 +3186,10 @@ func GetMultiFileDatabaseDefinition(ctx schema.GetDefinitionContext, metadata *s
continue
}
- var buf strings.Builder
- if err := writeSequenceSDL(&buf, schemaName, sequence); err != nil {
- return nil, errors.Wrapf(err, "failed to generate sequence SDL for %s.%s", schemaName, sequence.Name)
+ // Collect independent sequences (no owner)
+ if sequence.OwnerTable == "" || sequence.OwnerColumn == "" {
+ independentSequences = append(independentSequences, sequence)
}
- buf.WriteString(";\n")
-
- // Add sequence comment if present
- if len(sequence.Comment) > 0 {
- buf.WriteString("\n")
- if err := writeSequenceCommentSDL(&buf, schemaName, sequence); err != nil {
- return nil, errors.Wrapf(err, "failed to generate sequence comment for %s.%s", schemaName, sequence.Name)
- }
- }
-
- // Add ALTER SEQUENCE OWNED BY for sequences with owners
- if sequence.OwnerTable != "" && sequence.OwnerColumn != "" {
- buf.WriteString("\n")
- if err := writeAlterSequenceOwnedBy(&buf, schemaName, sequence); err != nil {
- return nil, errors.Wrapf(err, "failed to generate ALTER SEQUENCE OWNED BY for %s.%s", schemaName, sequence.Name)
- }
- }
-
- files = append(files, schema.File{
- Name: fmt.Sprintf("schemas/%s/sequences/%s.sql", schemaName, sequence.Name),
- Content: buf.String(),
- })
}
// Generate table files
@@ -3263,6 +3242,38 @@ func GetMultiFileDatabaseDefinition(ctx schema.GetDefinitionContext, metadata *s
}
}
+ // Write owned sequences (non-serial/non-identity) for this table
+ for _, sequence := range tableSequences {
+ // Skip sequences that belong to serial or identity columns
+ sequenceKey := schemaName + "." + sequence.Name
+ if skipSequences[sequenceKey] {
+ continue
+ }
+
+ // Only include sequences with owners (non-independent sequences)
+ if sequence.OwnerTable != "" && sequence.OwnerColumn != "" {
+ buf.WriteString("\n")
+ if err := writeSequenceSDL(&buf, schemaName, sequence); err != nil {
+ return nil, errors.Wrapf(err, "failed to generate sequence SDL for %s.%s", schemaName, sequence.Name)
+ }
+ buf.WriteString(";\n")
+
+ // Add sequence comment if present
+ if len(sequence.Comment) > 0 {
+ buf.WriteString("\n")
+ if err := writeSequenceCommentSDL(&buf, schemaName, sequence); err != nil {
+ return nil, errors.Wrapf(err, "failed to generate sequence comment for %s.%s", schemaName, sequence.Name)
+ }
+ }
+
+ // Add ALTER SEQUENCE OWNED BY
+ buf.WriteString("\n")
+ if err := writeAlterSequenceOwnedBy(&buf, schemaName, sequence); err != nil {
+ return nil, errors.Wrapf(err, "failed to generate ALTER SEQUENCE OWNED BY for %s.%s", schemaName, sequence.Name)
+ }
+ }
+ }
+
files = append(files, schema.File{
Name: fmt.Sprintf("schemas/%s/tables/%s.sql", schemaName, table.Name),
Content: buf.String(),
@@ -3320,6 +3331,34 @@ func GetMultiFileDatabaseDefinition(ctx schema.GetDefinitionContext, metadata *s
Content: buf.String(),
})
}
+
+ // Generate a single file for all independent sequences (no owner) in this schema
+ if len(independentSequences) > 0 {
+ var buf strings.Builder
+ for i, sequence := range independentSequences {
+ if i > 0 {
+ buf.WriteString("\n")
+ }
+
+ if err := writeSequenceSDL(&buf, schemaName, sequence); err != nil {
+ return nil, errors.Wrapf(err, "failed to generate sequence SDL for %s.%s", schemaName, sequence.Name)
+ }
+ buf.WriteString(";\n")
+
+ // Add sequence comment if present
+ if len(sequence.Comment) > 0 {
+ buf.WriteString("\n")
+ if err := writeSequenceCommentSDL(&buf, schemaName, sequence); err != nil {
+ return nil, errors.Wrapf(err, "failed to generate sequence comment for %s.%s", schemaName, sequence.Name)
+ }
+ }
+ }
+
+ files = append(files, schema.File{
+ Name: fmt.Sprintf("schemas/%s/sequences.sql", schemaName),
+ Content: buf.String(),
+ })
+ }
}
return &schema.MultiFileSchemaResult{Files: files}, nil
diff --git a/backend/plugin/schema/pg/get_database_definition_sdl_test.go b/backend/plugin/schema/pg/get_database_definition_sdl_test.go
index 6b432842a7..22ab7e3183 100644
--- a/backend/plugin/schema/pg/get_database_definition_sdl_test.go
+++ b/backend/plugin/schema/pg/get_database_definition_sdl_test.go
@@ -1603,9 +1603,9 @@ func TestGetMultiFileDatabaseDefinition_WithComments(t *testing.T) {
fileMap[file.Name] = file.Content
}
- // Verify sequence file with comment
- sequenceFile, ok := fileMap["schemas/app_schema/sequences/order_seq.sql"]
- require.True(t, ok, "sequence file should exist")
+ // Verify consolidated sequences file with comment (independent sequences go in sequences.sql)
+ sequenceFile, ok := fileMap["schemas/app_schema/sequences.sql"]
+ require.True(t, ok, "sequences.sql file should exist for independent sequences")
assert.Contains(t, sequenceFile, `CREATE SEQUENCE "app_schema"."order_seq"`)
assert.Contains(t, sequenceFile, `COMMENT ON SEQUENCE "app_schema"."order_seq" IS 'Sequence for orders';`)
@@ -1819,25 +1819,26 @@ func TestGetMultiFileDatabaseDefinition_SerialColumnWithSequence(t *testing.T) {
require.Contains(t, ordersFile, `"order_number" bigint DEFAULT nextval('custom_seq'::regclass) NOT NULL`,
"order_number should use custom_seq via DEFAULT nextval()")
- // Verify independent sequence file exists with comment
- independentSeqFile, ok := fileMap["schemas/public/sequences/independent_seq.sql"]
+ // Verify the consolidated sequences file exists with both independent sequences
+ sequencesFile, ok := fileMap["schemas/public/sequences.sql"]
require.True(t, ok, "independent_seq file should exist")
- require.Contains(t, independentSeqFile, `CREATE SEQUENCE "public"."independent_seq"`)
- require.Contains(t, independentSeqFile, `COMMENT ON SEQUENCE "public"."independent_seq" IS 'Independent sequence - should appear as separate file'`)
-
- // Verify custom sequence file exists with comment (no ALTER SEQUENCE OWNED BY because it's independent)
- customSeqFile, ok := fileMap["schemas/public/sequences/custom_seq.sql"]
- require.True(t, ok, "custom_seq file should exist")
- require.Contains(t, customSeqFile, `CREATE SEQUENCE "public"."custom_seq"`)
- require.Contains(t, customSeqFile, `COMMENT ON SEQUENCE "public"."custom_seq" IS 'Custom sequence for orders - should appear as separate file'`)
- require.NotContains(t, customSeqFile, `ALTER SEQUENCE`, "Independent sequence should not have ALTER SEQUENCE OWNED BY")
-
- // Verify users_id_seq does NOT have a separate file (it's a serial sequence)
- _, ok = fileMap["schemas/public/sequences/users_id_seq.sql"]
- require.False(t, ok, "users_id_seq should NOT have a separate file because it's owned by a serial column")
-
- // Total files should be: 2 tables + 2 sequences = 4 files
- require.Equal(t, 4, len(result.Files), "Should have exactly 4 files (2 tables + 2 sequences)")
+ require.Contains(t, sequencesFile, `CREATE SEQUENCE "public"."independent_seq"`)
+ require.Contains(t, sequencesFile, `COMMENT ON SEQUENCE "public"."independent_seq" IS 'Independent sequence - should appear as separate file'`)
+ require.Contains(t, sequencesFile, `CREATE SEQUENCE "public"."custom_seq"`)
+ require.Contains(t, sequencesFile, `COMMENT ON SEQUENCE "public"."custom_seq" IS 'Custom sequence for orders - should appear as separate file'`)
+ require.NotContains(t, sequencesFile, `ALTER SEQUENCE`, "Independent sequences should not have ALTER SEQUENCE OWNED BY")
+
+ // Verify individual sequence files do NOT exist (they should be in the consolidated file)
+ _, ok = fileMap["schemas/public/sequences/independent_seq.sql"]
+ require.False(t, ok, "independent_seq should NOT have individual file (should be in sequences.sql)")
+ _, ok = fileMap["schemas/public/sequences/custom_seq.sql"]
+ require.False(t, ok, "custom_seq should NOT have individual file (should be in sequences.sql)")
+
+ // Verify users_id_seq does NOT appear in the sequences file (it's a serial sequence)
+ require.NotContains(t, sequencesFile, "users_id_seq", "users_id_seq should NOT appear in sequences.sql because it's owned by a serial column")
+
+ // Total files should be: 2 tables + 1 sequences file = 3 files
+ require.Equal(t, 3, len(result.Files), "Should have exactly 3 files (2 tables + 1 consolidated sequences file)")
}
func TestGetDatabaseDefinitionSDLFormat_MultipleSequencesClaimingOwnership(t *testing.T) {