Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat(pg): migrate diagnose from ANTLR to omni parser (#19685)
rebelice00351cab8365
diff --git a/backend/plugin/parser/pg/diagnose.go b/backend/plugin/parser/pg/diagnose.goindex 34a9acea92..eb23d307ea 100644--- a/backend/plugin/parser/pg/diagnose.go+++ b/backend/plugin/parser/pg/diagnose.go@@ -2,11 +2,11 @@ package pgimport ("context"+ "errors""strings""unicode"- "github.com/antlr4-go/antlr/v4"- parser "github.com/bytebase/parser/postgresql"+ omniparser "github.com/bytebase/omni/pg/parser"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base"@@ -27,8 +27,7 @@ func Diagnose(_ context.Context, _ base.DiagnoseContext, statement string) ([]bareturn diagnostics, nil}-// parsePostgreSQLStatement parses the given SQL and returns the ParseResult.-// Use the PostgreSQL parser based on antlr4.+// parsePostgreSQLStatement parses the given SQL and returns a SyntaxError if any.func parsePostgreSQLStatement(statement string) *base.SyntaxError {trimmedStatement := strings.TrimRightFunc(statement, unicode.IsSpace)if len(trimmedStatement) > 0 && !strings.HasSuffix(trimmedStatement, ";") {@@ -36,35 +35,24 @@ func parsePostgreSQLStatement(statement string) *base.SyntaxError {// for the last statement in the script.statement += ";"}- lexer := parser.NewPostgreSQLLexer(antlr.NewInputStream(statement))- stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)- p := parser.NewPostgreSQLParser(stream)- startPosition := &storepb.Position{Line: 1}- lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- StartPosition: startPosition,- }- lexer.RemoveErrorListeners()- lexer.AddErrorListener(lexerErrorListener)- parserErrorListener := &base.ParseErrorListener{- Statement: statement,- StartPosition: startPosition,+ _, err := ParsePg(statement)+ if err == nil {+ return nil}- p.RemoveErrorListeners()- p.AddErrorListener(parserErrorListener)-- p.BuildParseTrees = false- _ = p.Root()-- if lexerErrorListener.Err != nil {- return lexerErrorListener.Err+ var parseErr *omniparser.ParseError+ if !errors.As(err, &parseErr) {+ return &base.SyntaxError{+ Position: &storepb.Position{Line: 1, Column: 1},+ Message: err.Error(),+ }}- if parserErrorListener.Err != nil {- return parserErrorListener.Err+ pos := byteOffsetToRunePosition(statement, parseErr.Position)+ return &base.SyntaxError{+ Position: pos,+ Message: parseErr.Message,+ RawMessage: parseErr.Message,}-- return nil}