Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: migrate mssql diagnose to omni parser (#20225)
rebelice9967cb6a7713
diff --git a/backend/plugin/parser/tsql/diagnose.go b/backend/plugin/parser/tsql/diagnose.goindex 4e1dfb0e02..3896981b4f 100644--- a/backend/plugin/parser/tsql/diagnose.go+++ b/backend/plugin/parser/tsql/diagnose.go@@ -2,11 +2,11 @@ package tsqlimport ("context"+ "errors""strings""unicode"- "github.com/antlr4-go/antlr/v4"- parser "github.com/bytebase/parser/tsql"+ mssqlomniparser "github.com/bytebase/omni/mssql/parser"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base"@@ -33,36 +33,24 @@ func parseTSQLStatement(statement string) *base.SyntaxError {// for the last statement in the script.statement += ";"}- inputStream := antlr.NewInputStream(statement)- lexer := parser.NewTSqlLexer(inputStream)- stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)- p := parser.NewTSqlParser(stream)- startPosition := &storepb.Position{Line: 1}- lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- StartPosition: startPosition,+ _, err := ParseTSQLOmni(statement)+ if err == nil {+ return nil}- lexer.RemoveErrorListeners()- lexer.AddErrorListener(lexerErrorListener)- parserErrorListener := &base.ParseErrorListener{- Statement: statement,- StartPosition: startPosition,+ var parseErr *mssqlomniparser.ParseError+ if !errors.As(err, &parseErr) {+ return &base.SyntaxError{+ Position: &storepb.Position{Line: 1, Column: 1},+ Message: err.Error(),+ }}- p.RemoveErrorListeners()- p.AddErrorListener(parserErrorListener)- p.BuildParseTrees = false-- _ = p.Tsql_file()-- if lexerErrorListener.Err != nil {- return lexerErrorListener.Err- }-- if parserErrorListener.Err != nil {- return parserErrorListener.Err+ message := parseErr.Error()+ return &base.SyntaxError{+ Position: ByteOffsetToRunePosition(statement, parseErr.Position),+ Message: message,+ RawMessage: message,}- return nil}diff --git a/backend/plugin/parser/tsql/diagnose_test.go b/backend/plugin/parser/tsql/diagnose_test.gonew file mode 100644index 0000000000..0e42caf158--- /dev/null+++ b/backend/plugin/parser/tsql/diagnose_test.go@@ -0,0 +1,53 @@+package tsql++import (+ "context"+ "testing"++ "github.com/stretchr/testify/require"++ "github.com/bytebase/bytebase/backend/plugin/parser/base"+)++func TestDiagnoseUsesOmniParseError(t *testing.T) {+ tests := []struct {+ name string+ statement string+ message string+ line uint32+ character uint32+ }{+ {+ name: "single line",+ statement: "SELECT FROM",+ message: `syntax error at or near "FROM"`,+ line: 0,+ character: 7,+ },+ {+ name: "second line",+ statement: "SELECT 1;\nSELECT FROM",+ message: `syntax error at or near "FROM"`,+ line: 1,+ character: 7,+ },+ {+ name: "line after non-ascii",+ statement: "SELECT N'你好';\nSELECT FROM",+ message: `syntax error at or near "FROM"`,+ line: 1,+ character: 7,+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ diagnostics, err := Diagnose(context.Background(), base.DiagnoseContext{}, tt.statement)+ require.NoError(t, err)+ require.Len(t, diagnostics, 1)+ require.Equal(t, tt.message, diagnostics[0].Message)+ require.Equal(t, tt.line, diagnostics[0].Range.Start.Line)+ require.Equal(t, tt.character, diagnostics[0].Range.Start.Character)+ })+ }+}