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: skip DML dry run when DDL statements are present (#19254)
p0nyf684894b1efc
diff --git a/backend/plugin/advisor/contains_ddl_test.go b/backend/plugin/advisor/contains_ddl_test.gonew file mode 100644index 0000000000..caf74dc1b5--- /dev/null+++ b/backend/plugin/advisor/contains_ddl_test.go@@ -0,0 +1,90 @@+package advisor_test++import (+ "testing"++ "github.com/stretchr/testify/require"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/advisor"+ "github.com/bytebase/bytebase/backend/plugin/parser/base"++ // Register parsers and statement type getters via init().+ _ "github.com/bytebase/bytebase/backend/plugin/parser/mysql"+ _ "github.com/bytebase/bytebase/backend/plugin/parser/pg"+ _ "github.com/bytebase/bytebase/backend/plugin/parser/plsql"+ _ "github.com/bytebase/bytebase/backend/plugin/parser/tidb"+)++func TestContainsDDL(t *testing.T) {+ tests := []struct {+ name string+ engine storepb.Engine+ sql string+ wantDDL bool+ }{+ {+ name: "PostgreSQL: DML only",+ engine: storepb.Engine_POSTGRES,+ sql: "INSERT INTO t VALUES (1); UPDATE t SET a = 1; DELETE FROM t;",+ wantDDL: false,+ },+ {+ name: "PostgreSQL: DDL only",+ engine: storepb.Engine_POSTGRES,+ sql: "CREATE TABLE t (id INT);",+ wantDDL: true,+ },+ {+ name: "PostgreSQL: mixed DDL and DML",+ engine: storepb.Engine_POSTGRES,+ sql: "CREATE TABLE t (id INT); INSERT INTO t VALUES (1);",+ wantDDL: true,+ },+ {+ name: "PostgreSQL: SET ROLE should not be treated as DDL",+ engine: storepb.Engine_POSTGRES,+ sql: "SET ROLE 'admin'; INSERT INTO t VALUES (1);",+ wantDDL: false,+ },+ {+ name: "MySQL: DML only",+ engine: storepb.Engine_MYSQL,+ sql: "INSERT INTO t VALUES (1); UPDATE t SET a = 1;",+ wantDDL: false,+ },+ {+ name: "MySQL: mixed DDL and DML",+ engine: storepb.Engine_MYSQL,+ sql: "CREATE TABLE t (id INT); INSERT INTO t VALUES (1);",+ wantDDL: true,+ },+ {+ name: "MySQL: SET should not be treated as DDL",+ engine: storepb.Engine_MYSQL,+ sql: "SET @a = 1; INSERT INTO t VALUES (1);",+ wantDDL: false,+ },+ {+ name: "TiDB: DML only",+ engine: storepb.Engine_TIDB,+ sql: "INSERT INTO t VALUES (1); DELETE FROM t;",+ wantDDL: false,+ },+ {+ name: "TiDB: mixed DDL and DML",+ engine: storepb.Engine_TIDB,+ sql: "CREATE TABLE t (id INT); INSERT INTO t VALUES (1);",+ wantDDL: true,+ },+ }++ for _, tc := range tests {+ t.Run(tc.name, func(t *testing.T) {+ stmts, err := base.ParseStatements(tc.engine, tc.sql)+ require.NoError(t, err)+ got := advisor.ContainsDDL(tc.engine, stmts)+ require.Equal(t, tc.wantDDL, got)+ })+ }+}diff --git a/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go b/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.goindex 0b18f95b4d..18863fafdb 100644--- a/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go+++ b/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go@@ -37,6 +37,12 @@ func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Coreturn nil, err}+ // BYT-8855: Skip DML dry run if there are DDL statements mixed in, because DML+ // statements often reference objects created by DDL statements, causing false positives.+ if advisor.ContainsDDL(checkCtx.DBType, checkCtx.ParsedStatements) {+ return nil, nil+ }+// Create the rulerule := NewStatementDmlDryRunRule(ctx, level, checkCtx.Rule.Type.String(), checkCtx.Driver)diff --git a/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go b/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.goindex 204f2b56f9..ae10496bd5 100644--- a/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go+++ b/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go@@ -34,6 +34,12 @@ func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Coreturn nil, err}+ // BYT-8855: Skip DML dry run if there are DDL statements mixed in, because DML+ // statements often reference objects created by DDL statements, causing false positives.+ if advisor.ContainsDDL(checkCtx.DBType, checkCtx.ParsedStatements) {+ return nil, nil+ }+rule := NewStatementDmlDryRunRule(ctx, level, checkCtx.Rule.Type.String(), checkCtx.Driver)checker := NewGenericChecker([]Rule{rule})diff --git a/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go b/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.goindex 8534b24a80..d305ef8a36 100644--- a/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go+++ b/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go@@ -39,6 +39,12 @@ func (*StatementDMLDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Coreturn nil, nil}+ // BYT-8855: Skip DML dry run if there are DDL statements mixed in, because DML+ // statements often reference objects created by DDL statements, causing false positives.+ if advisor.ContainsDDL(checkCtx.DBType, checkCtx.ParsedStatements) {+ return nil, nil+ }+var adviceList []*storepb.Advicevar setRoles []stringfor _, stmtInfo := range checkCtx.ParsedStatements {diff --git a/backend/plugin/advisor/tidb/advisor_statement_dml_dry_run.go b/backend/plugin/advisor/tidb/advisor_statement_dml_dry_run.goindex 4a14e1ee39..05a03e49c5 100644--- a/backend/plugin/advisor/tidb/advisor_statement_dml_dry_run.go+++ b/backend/plugin/advisor/tidb/advisor_statement_dml_dry_run.go@@ -42,6 +42,12 @@ func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Coif err != nil {return nil, err}+ // BYT-8855: Skip DML dry run if there are DDL statements mixed in, because DML+ // statements often reference objects created by DDL statements, causing false positives.+ if advisor.ContainsDDL(checkCtx.DBType, checkCtx.ParsedStatements) {+ return nil, nil+ }+checker := &statementDmlDryRunChecker{level: level,title: checkCtx.Rule.Type.String(),diff --git a/backend/plugin/advisor/utils.go b/backend/plugin/advisor/utils.goindex df04a932c6..cfd1501f64 100644--- a/backend/plugin/advisor/utils.go+++ b/backend/plugin/advisor/utils.go@@ -11,6 +11,7 @@ import ("github.com/bytebase/bytebase/backend/common/log"storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/parser/base")type QueryContext struct {@@ -136,6 +137,29 @@ func Query(ctx context.Context, qCtx QueryContext, connection *sql.DB, engine streturn []any{columnNames, columnTypeNames, data}, nil}+// ContainsDDL checks if any of the parsed statements is a DDL statement.+// When DDLs and DMLs are mixed, DML statements often reference objects created+// by DDL statements, causing false positives in dry run checks.+// BYT-8855+func ContainsDDL(engine storepb.Engine, parsedStatements []base.ParsedStatement) bool {+ asts := base.ExtractASTs(parsedStatements)+ types, err := base.GetStatementTypes(engine, asts)+ if err != nil {+ return false+ }+ for _, t := range types {+ switch t {+ case storepb.StatementType_STATEMENT_TYPE_UNSPECIFIED,+ storepb.StatementType_INSERT,+ storepb.StatementType_UPDATE,+ storepb.StatementType_DELETE:+ default:+ return true+ }+ }+ return false+}+func DatabaseExists(ctx context.Context, checkCtx Context, database string) bool {if checkCtx.ListDatabaseNamesFunc == nil {return false