Skip to content

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

fix: preserve SET ROLE statements across parsed statements in PG advisors (#19243)

p0nyec19c00f34d6
diff --git a/backend/plugin/advisor/pg/advisor_insert_row_limit.go b/backend/plugin/advisor/pg/advisor_insert_row_limit.go
index 34b50cf3b7..c830f03f23 100644
--- a/backend/plugin/advisor/pg/advisor_insert_row_limit.go
+++ b/backend/plugin/advisor/pg/advisor_insert_row_limit.go
@@ -47,6 +47,7 @@ func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Contex
}
var adviceList []*storepb.Advice
+ var setRoles []string
for _, stmtInfo := range checkCtx.ParsedStatements {
if stmtInfo.AST == nil {
continue
@@ -64,6 +65,7 @@ func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Contex
driver: checkCtx.Driver,
ctx: ctx,
tokens: antlrAST.Tokens,
+ setRoles: setRoles,
TenantMode: checkCtx.TenantMode,
}
rule.SetBaseLine(stmtInfo.BaseLine())
@@ -71,6 +73,7 @@ func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Contex
checker := NewGenericChecker([]Rule{rule})
antlr.ParseTreeWalkerDefault.Walk(checker, antlrAST.Tree)
adviceList = append(adviceList, checker.GetAdviceList()...)
+ setRoles = rule.setRoles
}
return adviceList, nil
diff --git a/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go b/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go
index d8ae7926fc..e39a8a9b09 100644
--- a/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go
+++ b/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go
@@ -47,6 +47,7 @@ func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx adv
}
var adviceList []*storepb.Advice
+ var setRoles []string
for _, stmtInfo := range checkCtx.ParsedStatements {
if stmtInfo.AST == nil {
continue
@@ -64,6 +65,7 @@ func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx adv
ctx: ctx,
driver: checkCtx.Driver,
tenantMode: checkCtx.TenantMode,
+ setRoles: setRoles,
tokens: antlrAST.Tokens,
}
rule.SetBaseLine(stmtInfo.BaseLine())
@@ -71,6 +73,7 @@ func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx adv
checker := NewGenericChecker([]Rule{rule})
antlr.ParseTreeWalkerDefault.Walk(checker, antlrAST.Tree)
adviceList = append(adviceList, checker.GetAdviceList()...)
+ setRoles = rule.setRoles
}
return adviceList, nil
diff --git a/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go b/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go
index 32a3ebcf10..8534b24a80 100644
--- a/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go
+++ b/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go
@@ -40,6 +40,7 @@ func (*StatementDMLDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Co
}
var adviceList []*storepb.Advice
+ var setRoles []string
for _, stmtInfo := range checkCtx.ParsedStatements {
if stmtInfo.AST == nil {
continue
@@ -56,6 +57,7 @@ func (*StatementDMLDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Co
ctx: ctx,
driver: checkCtx.Driver,
tenantMode: checkCtx.TenantMode,
+ setRoles: setRoles,
tokens: antlrAST.Tokens,
}
rule.SetBaseLine(stmtInfo.BaseLine())
@@ -63,6 +65,7 @@ func (*StatementDMLDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Co
checker := NewGenericChecker([]Rule{rule})
antlr.ParseTreeWalkerDefault.Walk(checker, antlrAST.Tree)
adviceList = append(adviceList, checker.GetAdviceList()...)
+ setRoles = rule.setRoles
}
return adviceList, nil