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): apply CREATE VIEW column alias list in query span extraction (#19984)
h3n4l5d2b08a89423
diff --git a/backend/plugin/parser/tsql/query_span_extractor.go b/backend/plugin/parser/tsql/query_span_extractor.goindex 8bc4f479f3..0e741edea0 100644--- a/backend/plugin/parser/tsql/query_span_extractor.go+++ b/backend/plugin/parser/tsql/query_span_extractor.go@@ -761,8 +761,11 @@ func (q *querySpanExtractor) tsqlFindTableSchema(fullTableName parser.IFull_tabl}func (q *querySpanExtractor) getColumnsFromCreateView(definition string, viewDatabaseName string, viewSchemaName string) ([]base.QuerySpanResult, error) {- // Extract the SELECT body from CREATE VIEW statement- selectBody, err := getSelectBodyFromCreateView(definition)+ // Extract the SELECT body and optional column alias list from CREATE VIEW statement.+ // e.g. CREATE VIEW vw (F1, F2) AS SELECT col_a, col_b FROM tbl+ // selectBody = "SELECT col_a, col_b FROM tbl"+ // columnAliases = ["F1", "F2"]+ selectBody, columnAliases, err := getSelectBodyFromCreateView(definition)if err != nil {return nil, errors.Wrapf(err, "failed to extract SELECT body from CREATE VIEW")}@@ -780,6 +783,15 @@ func (q *querySpanExtractor) getColumnsFromCreateView(definition string, viewDatif span.NotFoundError != nil {return nil, span.NotFoundError}++ // Apply column aliases from the CREATE VIEW header if present.+ // The alias list renames the SELECT body columns positionally.+ if len(columnAliases) > 0 && len(columnAliases) == len(span.Results) {+ for i, alias := range columnAliases {+ span.Results[i].Name = alias+ }+ }+return span.Results, nil}@@ -3673,35 +3685,36 @@ func unquote(name string) string {return name}-func getSelectBodyFromCreateView(createView string) (string, error) {+func getSelectBodyFromCreateView(createView string) (string, []string, error) {antlrASTs, err := ParseTSQL(createView)if err != nil {- return "", err+ return "", nil, err}if len(antlrASTs) != 1 {- return "", errors.Errorf("expected exactly 1 statement, got %d", len(antlrASTs))+ return "", nil, errors.Errorf("expected exactly 1 statement, got %d", len(antlrASTs))}ast := antlrASTs[0]tree := ast.Treeif tree == nil {- return "", errors.Errorf("parse tree is nil")+ return "", nil, errors.Errorf("parse tree is nil")}extractor := &selectBodyExtractor{}antlr.ParseTreeWalkerDefault.Walk(extractor, tree)if extractor.selectBody == "" {- return "", errors.Errorf("no SELECT statement found in CREATE VIEW")+ return "", nil, errors.Errorf("no SELECT statement found in CREATE VIEW")}- return extractor.selectBody, nil+ return extractor.selectBody, extractor.columnAliases, nil}type selectBodyExtractor struct {*parser.BaseTSqlParserListener- selectBody string+ selectBody string+ columnAliases []string}func (e *selectBodyExtractor) EnterCreate_view(ctx *parser.Create_viewContext) {@@ -3714,4 +3727,12 @@ func (e *selectBodyExtractor) EnterCreate_view(ctx *parser.Create_viewContext) {interval := antlr.NewInterval(start, stop)e.selectBody = input.GetTextFromInterval(interval)}++ // Extract the optional column alias list: CREATE VIEW vw (F1, F2) AS SELECT ...+ if columnNameList := ctx.Column_name_list(); columnNameList != nil {+ for _, id := range columnNameList.AllId_() {+ _, normalizedName := NormalizeTSQLIdentifier(id)+ e.columnAliases = append(e.columnAliases, normalizedName)+ }+ }}diff --git a/backend/plugin/parser/tsql/test-data/query-span/regression.yaml b/backend/plugin/parser/tsql/test-data/query-span/regression.yamlindex d5d4eaacef..5dca292aca 100644--- a/backend/plugin/parser/tsql/test-data/query-span/regression.yaml+++ b/backend/plugin/parser/tsql/test-data/query-span/regression.yaml@@ -157,6 +157,84 @@table: TableBcolumn: IDB+- description: "BYT-9235: WHERE clause on view column fails when CREATE VIEW has column alias list"+ statement: |-+ SELECT top 10 * FROM [bhs].[dbo].[vwTest] a WHERE a.F1 LIKE 'MT%'+ defaultDatabase: bhs+ ignoreCaseSensitive: true+ metadata:+ - |-+ {+ "name": "bhs",+ "schemas": [+ {+ "name": "dbo",+ "views": [+ {+ "name": "vwTest",+ "definition": "CREATE VIEW [dbo].[vwTest] (F1, F2) AS SELECT col_a, col_b FROM tbl",+ "columns": [+ {+ "name": "F1"+ },+ {+ "name": "F2"+ }+ ]+ }+ ],+ "tables": [+ {+ "name": "tbl",+ "columns": [+ {+ "name": "col_a"+ },+ {+ "name": "col_b"+ }+ ]+ }+ ]+ }+ ]+ }+ querySpan:+ type: 1+ results:+ - name: f1+ sourcecolumns:+ - server: ""+ database: bhs+ schema: dbo+ table: tbl+ column: col_a+ isplainfield: true+ sourcefieldpaths: []+ selectasterisk: false+ - name: f2+ sourcecolumns:+ - server: ""+ database: bhs+ schema: dbo+ table: tbl+ column: col_b+ isplainfield: true+ sourcefieldpaths: []+ selectasterisk: false+ sourcecolumns:+ - server: ""+ database: bhs+ schema: dbo+ table: vwTest+ column: ""+ predicatecolumns:+ - server: ""+ database: bhs+ schema: dbo+ table: tbl+ column: col_a+- description: Test simple correlated subquery - fix for outer table sourcesstatement: |-SELECT HMNum FROM TableA WHERE HMNum = 'test'