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: finish adapting Oracle splitting and SQL Server SET checks to omni (#21618)
rebelice5abb0c488f96
diff --git a/backend/plugin/db/mssql/mssql_test.go b/backend/plugin/db/mssql/mssql_test.goindex 485ec963f8..a20d92a052 100644--- a/backend/plugin/db/mssql/mssql_test.go+++ b/backend/plugin/db/mssql/mssql_test.go@@ -353,6 +353,8 @@ SELECT id FROM dbo.t WHERE id = 3;`, queryContext)_, err = driver.QueryConn(ctx, conn, "SET NOEXEC ON;\nSELECT 1 AS one;", queryContext)require.EqualError(t, err, "SET NOEXEC is not supported")+ _, err = driver.QueryConn(ctx, conn, "SET ANSI_NULLS, NOEXEC ON;\nDELETE FROM dbo.t;", queryContext)+ require.EqualError(t, err, "SET NOEXEC is not supported")_, err = driver.QueryConn(ctx, conn, "SELECT 1 AS one;\nSELECT 1/0 AS x;", queryContext)require.ErrorContains(t, err, "Divide by zero error encountered")diff --git a/backend/plugin/db/mssql/stmt_type.go b/backend/plugin/db/mssql/stmt_type.goindex 4eedd8a169..96ff5723d7 100644--- a/backend/plugin/db/mssql/stmt_type.go+++ b/backend/plugin/db/mssql/stmt_type.go@@ -77,10 +77,13 @@ func classifyStmtType(node ast.Node) (stmtType, error) {return stmtTypeProcedure, nilcase *ast.SetOptionStmt:- if strings.EqualFold(n.Option, "NOEXEC") || strings.EqualFold(n.Option, "PARSEONLY") {- // These skip statements without an error, so the result sets that do- // arrive could not be matched to their statements.- return stmtTypeUnknown, errors.Errorf("SET %s is not supported", strings.ToUpper(n.Option))+ // One SET can list several options, as in SET ANSI_NULLS, NOEXEC ON.+ for _, option := range n.Options {+ if strings.EqualFold(option, "NOEXEC") || strings.EqualFold(option, "PARSEONLY") {+ // These skip statements without an error, so the result sets that do+ // arrive could not be matched to their statements.+ return stmtTypeUnknown, errors.Errorf("SET %s is not supported", strings.ToUpper(option))+ }}return stmtTypeUnknown, nildiff --git a/backend/plugin/db/mssql/stmt_type_test.go b/backend/plugin/db/mssql/stmt_type_test.goindex 64b4367d5b..7c2abd4897 100644--- a/backend/plugin/db/mssql/stmt_type_test.go+++ b/backend/plugin/db/mssql/stmt_type_test.go@@ -22,6 +22,9 @@ func TestGetStmtType(t *testing.T) {{stmt: "SET NOCOUNT ON", want: stmtTypeUnknown},{stmt: "SET NOEXEC ON", wantErr: "SET NOEXEC is not supported"},{stmt: "set parseonly on", wantErr: "SET PARSEONLY is not supported"},+ {stmt: "SET ANSI_NULLS, NOEXEC ON", wantErr: "SET NOEXEC is not supported"},+ {stmt: "SET QUOTED_IDENTIFIER, parseonly ON", wantErr: "SET PARSEONLY is not supported"},+ {stmt: "SET ANSI_NULLS, QUOTED_IDENTIFIER ON", want: stmtTypeUnknown},{stmt: "IF 1 = 1 SELECT 1", wantErr: "unsupported control flow statement"},} {t.Run(tc.stmt, func(t *testing.T) {diff --git a/backend/plugin/parser/plsql/split.go b/backend/plugin/parser/plsql/split.goindex 2f8e07f9d3..30712a0ee7 100644--- a/backend/plugin/parser/plsql/split.go+++ b/backend/plugin/parser/plsql/split.go@@ -33,7 +33,11 @@ func SplitSQL(statement string) ([]base.Statement, error) {byteEnd = endi += 2}- byteEnd = byteStart + trimOracleSegmentTrailingHidden(statement[byteStart:byteEnd])+ // Embedded Java or JavaScript source does not lex as SQL: its "--"+ // decrement would read as a comment and cut the source short.+ if seg.Kind != oracleparser.SegmentEmbeddedSource {+ byteEnd = byteStart + trimOracleSegmentTrailingHidden(statement[byteStart:byteEnd])+ }text := statement[byteStart:byteEnd]result = append(result, base.Statement{Text: text,diff --git a/backend/plugin/parser/plsql/split_test.go b/backend/plugin/parser/plsql/split_test.goindex 76515dccd0..2b630e27cf 100644--- a/backend/plugin/parser/plsql/split_test.go+++ b/backend/plugin/parser/plsql/split_test.go@@ -54,6 +54,39 @@ END update_salary;`, statements[1].Text)CREATE TABLE t(id NUMBER)`, statements[2].Text)}+func TestPLSQLSplitSQLKeepsEmbeddedSourceWhole(t *testing.T) {+ for _, tc := range []struct {+ name string+ source string+ suffix string+ }{+ {+ name: "Java source",+ source: "CREATE OR REPLACE AND COMPILE JAVA SOURCE NAMED \"Dec\" AS\npublic class Dec { public static int f(int n) { return n--; } }",+ suffix: "\n/\n",+ },+ {+ name: "MLE module",+ source: "CREATE OR REPLACE MLE MODULE dec_module LANGUAGE JAVASCRIPT AS\nexport function f(n) { return n--; }",+ suffix: "\n/\n",+ },+ {+ name: "inline MLE call spec",+ source: "CREATE OR REPLACE FUNCTION dec_js(n NUMBER) RETURN NUMBER\nAS MLE LANGUAGE JAVASCRIPT\n{{ return n--; }};",+ suffix: "\n",+ },+ } {+ t.Run(tc.name, func(t *testing.T) {+ statements, err := SplitSQL(tc.source + tc.suffix + "SELECT 1 FROM dual;")+ require.NoError(t, err)+ statements = base.FilterEmptyStatements(statements)+ require.Len(t, statements, 2)+ require.Equal(t, tc.source, statements[0].Text)+ require.Equal(t, "SELECT 1 FROM dual", strings.TrimSpace(statements[1].Text))+ })+ }+}+func TestPLSQLSplitSQLPreservesSQLSetStatements(t *testing.T) {statement := `SET DEFINE OFFSET TRANSACTION READ ONLY;