Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(parser): change ParseXXXX functions to return list of AST nodes (#18039)
h3n4l211b57239a51
diff --git a/backend/plugin/parser/bigquery/bigquery.go b/backend/plugin/parser/bigquery/bigquery.goindex 61d71e96fe..3b73660ad4 100644--- a/backend/plugin/parser/bigquery/bigquery.go+++ b/backend/plugin/parser/bigquery/bigquery.go@@ -12,12 +12,35 @@ import ()type ParseResult struct {- Tree antlr.Tree- Tokens *antlr.CommonTokenStream+ Tree antlr.Tree+ Tokens *antlr.CommonTokenStream+ BaseLine int}-// ParseBigQuerySQL parses the given SQL statement by using antlr4. Returns the AST and token stream if no error.-func ParseBigQuerySQL(statement string) (*ParseResult, error) {+// ParseBigQuerySQL parses the given SQL statement by using antlr4. Returns a list of AST and token stream if no error.+func ParseBigQuerySQL(statement string) ([]*ParseResult, error) {+ stmts, err := SplitSQL(statement)+ if err != nil {+ return nil, err+ }++ var result []*ParseResult+ for _, stmt := range stmts {+ if stmt.Empty {+ continue+ }++ parseResult, err := parseSingleBigQuerySQL(stmt.Text, stmt.BaseLine)+ if err != nil {+ return nil, err+ }+ result = append(result, parseResult)+ }++ return result, nil+}++func parseSingleBigQuerySQL(statement string, baseLine int) (*ParseResult, error) {statement = strings.TrimRightFunc(statement, utils.IsSpaceOrSemicolon) + "\n;"inputStream := antlr.NewInputStream(statement)lexer := parser.NewGoogleSQLLexer(inputStream)@@ -28,12 +51,14 @@ func ParseBigQuerySQL(statement string) (*ParseResult, error) {lexer.RemoveErrorListeners()lexerErrorListener := &base.ParseErrorListener{Statement: statement,+ BaseLine: baseLine,}lexer.AddErrorListener(lexerErrorListener)p.RemoveErrorListeners()parserErrorListener := &base.ParseErrorListener{Statement: statement,+ BaseLine: baseLine,}p.AddErrorListener(parserErrorListener)@@ -50,8 +75,9 @@ func ParseBigQuerySQL(statement string) (*ParseResult, error) {}result := &ParseResult{- Tree: tree,- Tokens: stream,+ Tree: tree,+ Tokens: stream,+ BaseLine: baseLine,}return result, nildiff --git a/backend/plugin/parser/bigquery/query_span_extractor.go b/backend/plugin/parser/bigquery/query_span_extractor.goindex 3df66fd4fd..830fc40e02 100644--- a/backend/plugin/parser/bigquery/query_span_extractor.go+++ b/backend/plugin/parser/bigquery/query_span_extractor.go@@ -43,7 +43,16 @@ func (q *querySpanExtractor) getQuerySpan(ctx context.Context, stmt string) (*baif err != nil {return nil, err}- tree := parseResults.Tree+ if len(parseResults) == 0 {+ return &base.QuerySpan{+ SourceColumns: base.SourceColumnSet{},+ Results: []base.QuerySpanResult{},+ }, nil+ }+ if len(parseResults) != 1 {+ return nil, errors.Errorf("expecting only one statement to get query span, but got %d", len(parseResults))+ }+ tree := parseResults[0].Treeq.ctx = ctxaccessTables, err := getAccessTables(q.defaultDatabase, tree)if err != nil {diff --git a/go.mod b/go.modindex 660447cc1c..3807cd3393 100644--- a/go.mod+++ b/go.mod@@ -293,7 +293,7 @@ require (github.com/aws/aws-sdk-go-v2/service/sts v1.39.0github.com/aws/smithy-go v1.23.1 // indirectgithub.com/beorn7/perks v1.0.1 // indirect- github.com/bytebase/parser v0.0.0-20251103101721-8b106e9a4f5a+ github.com/bytebase/parser v0.0.0-20251110090839-e7e9eb80d22cgithub.com/cespare/xxhash/v2 v2.3.0 // indirectgithub.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirectgithub.com/cockroachdb/cockroach-go/v2 v2.4.2diff --git a/go.sum b/go.sumindex 69298ce99d..81ae9dc232 100644--- a/go.sum+++ b/go.sum@@ -853,8 +853,8 @@ github.com/bytebase/gosasl v0.0.0-20240422091407-6b7481e86f08 h1:S1GgjJLspz4E4z4github.com/bytebase/gosasl v0.0.0-20240422091407-6b7481e86f08/go.mod h1:Qx8cW6jkI8riyzmklj80kAIkv+iezFUTBiGU0qHhHes=github.com/bytebase/lsp-protocol v0.0.0-20250324071136-1586d0c10ff0 h1:bJ8NSf2K+pccl5m/wuu97fiYjDwpJH6IzURAq/3XA2U=github.com/bytebase/lsp-protocol v0.0.0-20250324071136-1586d0c10ff0/go.mod h1:BEWMfiZtqshdmulKJcIsWb45MUaEvDO4CROcgi8dfFg=-github.com/bytebase/parser v0.0.0-20251103101721-8b106e9a4f5a h1:a/vntE2CQ559g2L0HceY5Xn3nXztzfzzJJiHkmeFOik=-github.com/bytebase/parser v0.0.0-20251103101721-8b106e9a4f5a/go.mod h1:jeak/EfutSOAuWKvrFIT2IZunhWprM7oTFBRgZ9RCxo=+github.com/bytebase/parser v0.0.0-20251110090839-e7e9eb80d22c h1:ci7hWZ8vb/iKkuEnjTdEoYgxVZgkLrr7n032RUH3t8I=+github.com/bytebase/parser v0.0.0-20251110090839-e7e9eb80d22c/go.mod h1:jeak/EfutSOAuWKvrFIT2IZunhWprM7oTFBRgZ9RCxo=github.com/bytebase/pgx/v5 v5.0.0-20250212161523-96ff8aed8767 h1:YuR5G3LcxpO5ScSTA+Kdirxg9RW4TRc/v1t7N2Hfmbw=github.com/bytebase/pgx/v5 v5.0.0-20250212161523-96ff8aed8767/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=github.com/bytebase/pkcs8 v0.0.0-20240612095628-fcd0a7484c94 h1:6PNsuNmSqCuR8Z616uQLzDIvujWCFsKzeVc3ECmVubk=