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: migrate Redshift parser to return list of ParseResults (#18179)
h3n4lf7f9240ed617
diff --git a/backend/plugin/parser/redshift/query.go b/backend/plugin/parser/redshift/query.goindex fe99a266d1..5f9fa2d869 100644--- a/backend/plugin/parser/redshift/query.go+++ b/backend/plugin/parser/redshift/query.go@@ -19,12 +19,12 @@ func init() {// 2. SELECT statement// We also support CTE with SELECT statements, but not with DML statements.// Returns (canRunInReadOnly, returnsData, error):-// - canRunInReadOnly: whether the query can run in read-only mode+// - canRunInReadOnly: whether all queries can run in read-only mode// - returnsData: whether all queries return data// - error: parsing error if the statement is invalidfunc ValidateSQLForEditor(statement string) (bool, bool, error) {// Parse the statement using the Redshift parser- result, err := ParseRedshift(statement)+ parseResults, err := ParseRedshift(statement)if err != nil {return false, false, err}@@ -35,7 +35,14 @@ func ValidateSQLForEditor(statement string) (bool, bool, error) {returnsData: true,}- antlr.ParseTreeWalkerDefault.Walk(validator, result.Tree)+ // Validate each statement+ for _, parseResult := range parseResults {+ antlr.ParseTreeWalkerDefault.Walk(validator, parseResult.Tree)+ // If any statement fails validation, return immediately+ if !validator.canRunInReadOnly {+ break+ }+ }return validator.canRunInReadOnly, validator.returnsData, nil}diff --git a/backend/plugin/parser/redshift/redshift.go b/backend/plugin/parser/redshift/redshift.goindex b16bcea0cb..61649f1df7 100644--- a/backend/plugin/parser/redshift/redshift.go+++ b/backend/plugin/parser/redshift/redshift.go@@ -5,6 +5,7 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/redshift"+ "github.com/pkg/errors"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base"@@ -16,26 +17,44 @@ func init() {}// parseRedshiftForRegistry is the ParseFunc for Redshift.-// Returns antlr.Tree on success.+// Returns []*ParseResult (list of AST nodes, one per statement) on success.func parseRedshiftForRegistry(statement string) (any, error) {- result, err := ParseRedshift(statement)- if err != nil {- return nil, err- }- if result == nil {- return nil, nil- }- return result.Tree, nil+ return ParseRedshift(statement)}// ParseResult is the result of parsing a Redshift statement.type ParseResult struct {- Tree antlr.Tree- Tokens *antlr.CommonTokenStream+ Tree antlr.Tree+ Tokens *antlr.CommonTokenStream+ BaseLine int+}++// ParseRedshift parses the given SQL statement and returns a list of ParseResults.+// Each ParseResult represents one statement with its AST, tokens, and base line offset.+func ParseRedshift(sql string) ([]*ParseResult, error) {+ stmts, err := SplitSQL(sql)+ if err != nil {+ return nil, errors.Wrap(err, "failed to split SQL")+ }++ var results []*ParseResult+ for _, stmt := range stmts {+ if stmt.Empty {+ continue+ }++ parseResult, err := parseSingleRedshift(stmt.Text, stmt.BaseLine)+ if err != nil {+ return nil, err+ }+ results = append(results, parseResult)+ }++ return results, nil}-// ParseRedshift parses the given SQL statement by using antlr4. Returns the AST and token stream if no error.-func ParseRedshift(statement string) (*ParseResult, error) {+// parseSingleRedshift parses a single Redshift statement by using antlr4. Returns the AST and token stream if no error.+func parseSingleRedshift(statement string, baseLine int) (*ParseResult, error) {statement = strings.TrimRightFunc(statement, utils.IsSpaceOrSemicolon) + ";"inputStream := antlr.NewInputStream(statement)lexer := parser.NewRedshiftLexer(inputStream)@@ -70,8 +89,9 @@ func ParseRedshift(statement string) (*ParseResult, error) {}result := &ParseResult{- Tree: tree,- Tokens: stream,+ Tree: tree,+ Tokens: stream,+ BaseLine: baseLine,}return result, nil