Skip to content

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

fix(pg): include SET ROLE and search_path in rollback SQL (#19124)

rebelice8ed7095ec6ac
diff --git a/backend/plugin/parser/pg/restore.go b/backend/plugin/parser/pg/restore.go
index dac46bed52..47fe06f3fa 100644
--- a/backend/plugin/parser/pg/restore.go
+++ b/backend/plugin/parser/pg/restore.go
@@ -123,6 +123,10 @@ func doGenerate(ctx context.Context, rCtx base.RestoreContext, sqlForComment str
}
if len(prependStatements) > 0 {
+ // Ensure prependStatements ends with semicolon
+ if !strings.HasSuffix(prependStatements, ";") {
+ prependStatements += ";"
+ }
return fmt.Sprintf("%s\n/*\nOriginal SQL:\n%s\n*/\n%s", prependStatements, sqlForComment, g.result), nil
}
return fmt.Sprintf("/*\nOriginal SQL:\n%s\n*/\n%s", sqlForComment, g.result), nil
@@ -331,7 +335,7 @@ func getPrependStatements(statement string) (string, error) {
return listener.setRoleText, nil
}
-// setRoleListener detects SET role statements
+// setRoleListener detects SET role and search_path statements
type setRoleListener struct {
*parser.BasePostgreSQLParserListener
setRoleText string
@@ -339,29 +343,52 @@ type setRoleListener struct {
// EnterVariablesetstmt handles SET statements
func (l *setRoleListener) EnterVariablesetstmt(ctx *parser.VariablesetstmtContext) {
- // Only process if we haven't found a SET role statement yet
+ // Only process if we haven't found a SET role/search_path statement yet
if l.setRoleText != "" {
return
}
- // Check if this is SET role
- // Structure: VariablesetstmtContext -> Set_rest -> Set_rest_more -> Generic_set -> Var_name
- if ctx.Set_rest() != nil {
- setRest := ctx.Set_rest()
- if setRest.Set_rest_more() != nil {
- setRestMore := setRest.Set_rest_more()
- if setRestMore.Generic_set() != nil {
- genericSet := setRestMore.Generic_set()
- if genericSet.Var_name() != nil {
- varName := genericSet.Var_name().GetText()
- if strings.EqualFold(varName, "role") {
- // Found SET role statement, capture the full text
- l.setRoleText = ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx)
- }
- }
+ setRest := ctx.Set_rest()
+ if setRest == nil {
+ return
+ }
+ setRestMore := setRest.Set_rest_more()
+ if setRestMore == nil {
+ return
+ }
+
+ // Check for "SET ROLE <name>" syntax (ROLE is a keyword/terminal)
+ // This is different from "SET role = <value>" which uses Generic_set
+ for i := 0; i < setRestMore.GetChildCount(); i++ {
+ child := setRestMore.GetChild(i)
+ if tn, ok := child.(*antlr.TerminalNodeImpl); ok {
+ if tn.GetText() == "ROLE" {
+ // Found SET ROLE syntax
+ l.setRoleText = ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx)
+ return
}
}
}
+
+ // Check for "SET role = <value>" or "SET search_path = <value>" syntax
+ // Structure: VariablesetstmtContext -> Set_rest -> Set_rest_more -> Generic_set -> Var_name
+ genericSet := setRestMore.Generic_set()
+ if genericSet == nil {
+ return
+ }
+ varName := genericSet.Var_name()
+ if varName == nil {
+ return
+ }
+ if len(varName.AllColid()) != 1 {
+ return
+ }
+
+ name := NormalizePostgreSQLColid(varName.Colid(0))
+ if name == "role" || name == "search_path" {
+ // Found SET role or search_path statement, capture the full text
+ l.setRoleText = ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx)
+ }
}
// statementAtPositionFinder finds if a parse tree contains a statement at the given position.
diff --git a/backend/plugin/parser/pg/test-data/test_restore.yaml b/backend/plugin/parser/pg/test-data/test_restore.yaml
index decce03ad2..6dd9a14a5b 100644
--- a/backend/plugin/parser/pg/test-data/test_restore.yaml
+++ b/backend/plugin/parser/pg/test-data/test_restore.yaml
@@ -114,3 +114,31 @@
UPDATE test SET c = 1 WHERE a = 1
*/
INSERT INTO "public"."test" SELECT * FROM "bbarchive"."prefix_1_test" ON CONFLICT ON CONSTRAINT "test_pk" DO UPDATE SET "c" = EXCLUDED."c";
+- input: |-
+ SET ROLE admin;
+ UPDATE test SET c = 1 WHERE a = 1;
+ backupdatabase: bbarchive
+ backuptable: prefix_1_test
+ originaldatabase: db
+ originaltable: test
+ result: |-
+ SET ROLE admin;
+ /*
+ Original SQL:
+ UPDATE test SET c = 1 WHERE a = 1
+ */
+ INSERT INTO "public"."test" SELECT * FROM "bbarchive"."prefix_1_test" ON CONFLICT ON CONSTRAINT "test_pk" DO UPDATE SET "c" = EXCLUDED."c";
+- input: |-
+ SET search_path = myschema, public;
+ DELETE FROM test WHERE a = 1;
+ backupdatabase: bbarchive
+ backuptable: prefix_1_test
+ originaldatabase: db
+ originaltable: test
+ result: |-
+ SET search_path = myschema, public;
+ /*
+ Original SQL:
+ DELETE FROM test WHERE a = 1
+ */
+ INSERT INTO "public"."test" SELECT * FROM "bbarchive"."prefix_1_test";