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(parser/mssql): propagate outer scope to correlated subquery in WHERE predicates (BYT-9298) (#20039)
h3n4l69c71a41286a
diff --git a/backend/plugin/parser/tsql/query_span_predicate.go b/backend/plugin/parser/tsql/query_span_predicate.goindex 5ad566fe88..370e32879e 100644--- a/backend/plugin/parser/tsql/query_span_predicate.go+++ b/backend/plugin/parser/tsql/query_span_predicate.go@@ -134,18 +134,27 @@ func (q *querySpanExtractor) extractPredicateColumnFromSubquery(return nil}- subquery := ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx)-- // TODO: outer table reference.- newQ := newQuerySpanExtractor(q.defaultDatabase, q.defaultSchema, q.gCtx, q.ignoreCaseSensitive)- newQ.ctes = q.ctes- span, err := newQ.getQuerySpan(q.ctx, subquery)+ // Clone the extractor so the subquery sees the enclosing FROM clause as+ // outer table sources. Without this, correlated subqueries like+ // `WHERE EXISTS (SELECT 1 FROM t e WHERE e.col = outer.col)` cannot+ // resolve the `outer` alias and fail with "no matching column".+ cloneExtractor := &querySpanExtractor{+ ctx: q.ctx,+ defaultDatabase: q.defaultDatabase,+ defaultSchema: q.defaultSchema,+ ignoreCaseSensitive: q.ignoreCaseSensitive,+ gCtx: q.gCtx,+ ctes: q.ctes,+ outerTableSources: append(q.outerTableSources, q.tableSourcesFrom...),+ predicateColumns: make(base.SourceColumnSet),+ }+ tableSource, err := cloneExtractor.extractTSqlSensitiveFieldsFromSubquery(ctx)if err != nil {- return errors.Wrapf(err, "failed to get query span for subquery: %s", subquery)+ return errors.Wrapf(err, "failed to get query span for subquery")}- q.predicateColumns, _ = base.MergeSourceColumnSet(q.predicateColumns, span.PredicateColumns)- for _, r := range span.Results {+ q.predicateColumns, _ = base.MergeSourceColumnSet(q.predicateColumns, cloneExtractor.predicateColumns)+ for _, r := range tableSource.GetQuerySpanResult() {q.predicateColumns, _ = base.MergeSourceColumnSet(q.predicateColumns, r.SourceColumns)}diff --git a/backend/plugin/parser/tsql/query_span_test.go b/backend/plugin/parser/tsql/query_span_test.goindex 179c525141..5b7691dc30 100644--- a/backend/plugin/parser/tsql/query_span_test.go+++ b/backend/plugin/parser/tsql/query_span_test.go@@ -1,6 +1,7 @@package tsqlimport (+ "bytes""context""io""os"@@ -74,10 +75,12 @@ func TestGetQuerySpan(t *testing.T) {}if record {- byteValue, err := yaml.Marshal(testCases)- a.NoError(err)- err = os.WriteFile(testDataPath, byteValue, 0644)- a.NoError(err)+ var buf bytes.Buffer+ enc := yaml.NewEncoder(&buf)+ enc.SetIndent(2)+ a.NoError(enc.Encode(testCases))+ a.NoError(enc.Close())+ a.NoError(os.WriteFile(testDataPath, buf.Bytes(), 0644))}}}diff --git a/backend/plugin/parser/tsql/test-data/query-span/regression.yaml b/backend/plugin/parser/tsql/test-data/query-span/regression.yamlindex d079852969..d264719710 100644--- a/backend/plugin/parser/tsql/test-data/query-span/regression.yaml+++ b/backend/plugin/parser/tsql/test-data/query-span/regression.yaml@@ -368,4 +368,69 @@database: WebPOschema: dbotable: TableA- column: HMNum\ No newline at end of file+ column: HMNum++- description: Test VIEW with correlated subquery referencing outer table - fix for BYT-9298+ statement: |-+ SELECT WanGrNumber FROM dbo.vw_gr_wan_number WHERE WanGrNumber = '123'+ defaultDatabase: Invoice+ ignoreCaseSensitive: true+ metadata:+ - |-+ {+ "name": "Invoice",+ "schemas": [+ {+ "name": "dbo",+ "views": [+ {+ "name": "vw_gr_wan_number",+ "definition": "CREATE VIEW [dbo].[vw_gr_wan_number] AS SELECT gr.SAP_NO AS WanGrNumber FROM dbo.gr_table gr WHERE NOT EXISTS (SELECT 1 FROM dbo.existing_gr_number e WHERE e.wan_gr_number = gr.SAP_NO)"+ }+ ],+ "tables": [+ {+ "name": "gr_table",+ "columns": [+ {+ "name": "SAP_NO"+ }+ ]+ },+ {+ "name": "existing_gr_number",+ "columns": [+ {+ "name": "wan_gr_number"+ }+ ]+ }+ ]+ }+ ]+ }+ querySpan:+ type: 1+ results:+ - name: wangrnumber+ sourcecolumns:+ - server: ""+ database: Invoice+ schema: dbo+ table: gr_table+ column: SAP_NO+ isplainfield: true+ sourcefieldpaths: []+ selectasterisk: false+ sourcecolumns:+ - server: ""+ database: Invoice+ schema: dbo+ table: vw_gr_wan_number+ column: ""+ predicatecolumns:+ - server: ""+ database: Invoice+ schema: dbo+ table: gr_table+ column: SAP_NO\ No newline at end of file