Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(schema): use function signature as key to preserve overloaded PostgreSQL functions (#19377)
Vincent Huang287ef3ccea6b
diff --git a/backend/plugin/schema/pg/get_database_definition.go b/backend/plugin/schema/pg/get_database_definition.goindex b6b5c6cbba..e46c832454 100644--- a/backend/plugin/schema/pg/get_database_definition.go+++ b/backend/plugin/schema/pg/get_database_definition.go@@ -117,7 +117,7 @@ func GetDatabaseDefinition(ctx schema.GetDefinitionContext, metadata *storepb.Daif function.SkipDump {continue}- funcID := getObjectID(schema.Name, function.Name)+ funcID := getObjectID(schema.Name, funcIdentity(function))functionMap[funcID] = functiongraph.AddNode(funcID)for _, dependency := range function.DependencyTables {@@ -405,7 +405,7 @@ func GetSchemaDefinition(schema *storepb.SchemaMetadata) (string, error) {if function.SkipDump {continue}- funcID := getObjectID(schema.Name, function.Name)+ funcID := getObjectID(schema.Name, funcIdentity(function))functionMap[funcID] = functiongraph.AddNode(funcID)for _, dependency := range function.DependencyTables {@@ -1355,6 +1355,15 @@ func writeAlterSequenceOwnedBy(out io.Writer, schema string, sequence *storepb.Sreturn err}+// funcIdentity returns the unique identity for a function, preferring+// the full signature (name + parameter types) to support overloaded functions.+func funcIdentity(f *storepb.FunctionMetadata) string {+ if f.Signature != "" {+ return f.Signature+ }+ return f.Name+}+func getObjectID(schema string, object string) string {var buf strings.Builder_, _ = buf.WriteString(schema)diff --git a/backend/plugin/schema/pg/get_database_definition_sdl_test.go b/backend/plugin/schema/pg/get_database_definition_sdl_test.goindex 41d6aadc29..f44089309d 100644--- a/backend/plugin/schema/pg/get_database_definition_sdl_test.go+++ b/backend/plugin/schema/pg/get_database_definition_sdl_test.go@@ -2107,3 +2107,68 @@ $$`,require.NoError(t, err, "SQL in file %s should be parseable by PostgreSQL parser", fileName)}}++func TestOverloadedFunctionsPreservedInDump(t *testing.T) {+ oneArgDef := `CREATE OR REPLACE FUNCTION "public"."camel_to_snake"(camel_cased_text character varying)+ RETURNS character varying+ LANGUAGE plpgsql+ IMMUTABLE+AS $function$+BEGIN+ RETURN lower(camel_cased_text);+END;+$function$`+ twoArgDef := `CREATE OR REPLACE FUNCTION "public"."camel_to_snake"(camel_cased_text character varying, case_directive character varying)+ RETURNS character varying+ LANGUAGE plpgsql+ IMMUTABLE+AS $function$+BEGIN+ RETURN lower(camel_cased_text || '_' || case_directive);+END;+$function$`++ metadata := &storepb.DatabaseSchemaMetadata{+ Schemas: []*storepb.SchemaMetadata{+ {+ Name: "public",+ Functions: []*storepb.FunctionMetadata{+ {+ Name: "camel_to_snake",+ Signature: "camel_to_snake(camel_cased_text character varying)",+ Definition: oneArgDef,+ },+ {+ Name: "camel_to_snake",+ Signature: "camel_to_snake(camel_cased_text character varying, case_directive character varying)",+ Definition: twoArgDef,+ },+ },+ },+ },+ }++ oneArgSubstring := `"camel_to_snake"(camel_cased_text character varying)`+ twoArgSubstring := `"camel_to_snake"(camel_cased_text character varying, case_directive character varying)`++ // Test non-SDL format (GetDatabaseDefinition)+ result, err := GetDatabaseDefinition(schema.GetDefinitionContext{}, metadata)+ require.NoError(t, err)+ assert.Contains(t, result, oneArgSubstring)+ assert.Contains(t, result, twoArgSubstring)+ assert.Equal(t, 2, strings.Count(result, "CREATE OR REPLACE FUNCTION"), "both overloads must survive in non-SDL dump")++ // Test SDL format+ resultSDL, err := GetDatabaseDefinition(schema.GetDefinitionContext{SDLFormat: true}, metadata)+ require.NoError(t, err)+ assert.Contains(t, resultSDL, oneArgSubstring)+ assert.Contains(t, resultSDL, twoArgSubstring)+ assert.Equal(t, 2, strings.Count(resultSDL, "CREATE OR REPLACE FUNCTION"), "both overloads must survive in SDL dump")++ // Test single-schema path (GetSchemaDefinition)+ resultSchema, err := GetSchemaDefinition(metadata.Schemas[0])+ require.NoError(t, err)+ assert.Contains(t, resultSchema, oneArgSubstring)+ assert.Contains(t, resultSchema, twoArgSubstring)+ assert.Equal(t, 2, strings.Count(resultSchema, "CREATE OR REPLACE FUNCTION"), "both overloads must survive in single-schema dump")+}