Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore: fix golangci-lint errors and refactor parser errors (#18351)

Danny Xuf2cb4c8f854c
diff --git a/backend/plugin/idp/ldap/ldap_test.go b/backend/plugin/idp/ldap/ldap_test.go
index 3105f35906..e2b26ca409 100644
--- a/backend/plugin/idp/ldap/ldap_test.go
+++ b/backend/plugin/idp/ldap/ldap_test.go
@@ -15,6 +15,7 @@ import (
)
func TestMain(m *testing.M) {
+ //nolint:revive
flag.Parse()
if !testing.Verbose() {
ldapserver.Logger = ldapserver.DiscardingLogger
diff --git a/backend/plugin/parser/errors/resources.go b/backend/plugin/parser/base/errors.go
similarity index 99%
rename from backend/plugin/parser/errors/resources.go
rename to backend/plugin/parser/base/errors.go
index a4be2c4b20..5516a244e2 100644
--- a/backend/plugin/parser/errors/resources.go
+++ b/backend/plugin/parser/base/errors.go
@@ -1,4 +1,4 @@
-package errors
+package base
import (
"fmt"
diff --git a/backend/plugin/parser/base/interface.go b/backend/plugin/parser/base/interface.go
index 04813ba433..caee8694d2 100644
--- a/backend/plugin/parser/base/interface.go
+++ b/backend/plugin/parser/base/interface.go
@@ -13,7 +13,6 @@ import (
lsp "github.com/bytebase/lsp-protocol"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -210,11 +209,11 @@ func GetQuerySpan(ctx context.Context, gCtx GetQuerySpanContext, engine storepb.
if err != nil {
// Try to unwrap the error to see if it's a ResourceNotFoundError to decrease the error noise.
// TODO(d): remove resource not found error checks.
- var resourceNotFound *parsererror.ResourceNotFoundError
+ var resourceNotFound *ResourceNotFoundError
if errors.As(err, &resourceNotFound) {
return nil, resourceNotFound
}
- var typeNotSupported *parsererror.TypeNotSupportedError
+ var typeNotSupported *TypeNotSupportedError
if errors.As(err, &typeNotSupported) {
return nil, typeNotSupported
}
diff --git a/backend/plugin/parser/bigquery/query_span_extractor.go b/backend/plugin/parser/bigquery/query_span_extractor.go
index fb5d304478..979fbe1b90 100644
--- a/backend/plugin/parser/bigquery/query_span_extractor.go
+++ b/backend/plugin/parser/bigquery/query_span_extractor.go
@@ -8,8 +8,6 @@ import (
"github.com/antlr4-go/antlr/v4"
parser "github.com/bytebase/parser/googlesql"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
-
"github.com/pkg/errors"
"github.com/bytebase/bytebase/backend/plugin/parser/base"
@@ -739,7 +737,7 @@ func (q *querySpanExtractor) getFieldColumnSource(_, tableName, fieldName string
}
}
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: nil,
Table: &tableName,
Column: &fieldName,
diff --git a/backend/plugin/parser/mysql/query_span_extractor.go b/backend/plugin/parser/mysql/query_span_extractor.go
index d968870fb5..2f4bf74a9c 100644
--- a/backend/plugin/parser/mysql/query_span_extractor.go
+++ b/backend/plugin/parser/mysql/query_span_extractor.go
@@ -10,7 +10,6 @@ import (
"github.com/pkg/errors"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
"github.com/bytebase/bytebase/backend/store/model"
"github.com/bytebase/bytebase/backend/plugin/parser/base"
@@ -110,7 +109,7 @@ func (q *querySpanExtractor) getQuerySpan(ctx context.Context, stmt string) (*ba
antlr.ParseTreeWalkerDefault.Walk(listener, tree)
err = listener.err
if err != nil {
- var resourceNotFound *parsererror.ResourceNotFoundError
+ var resourceNotFound *base.ResourceNotFoundError
if errors.As(err, &resourceNotFound) {
return &base.QuerySpan{
Type: base.Select,
@@ -528,7 +527,7 @@ func (q *querySpanExtractor) extractTableWild(ctx parser.ITableWildContext) ([]b
}
querySpanResults, ok := q.getAllTableColumnSources(databaseName, tableName)
if !ok {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Err: errors.Errorf("failed to find table to calculate asterisk"),
Database: &databaseName,
Table: &tableName,
@@ -1275,7 +1274,7 @@ func (q *querySpanExtractor) getFieldColumnSource(databaseName, tableName, field
}
}
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &databaseName,
Table: &tableName,
Column: &fieldName,
@@ -1346,7 +1345,7 @@ func (q *querySpanExtractor) findTableSchema(databaseName, tableName string) (ba
}
}
if dbMetadata == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &databaseName,
}
}
@@ -1354,7 +1353,7 @@ func (q *querySpanExtractor) findTableSchema(databaseName, tableName string) (ba
emptySchema := ""
schema := dbMetadata.GetSchemaMetadata(emptySchema)
if schema == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &databaseName,
Schema: &emptySchema,
}
@@ -1410,7 +1409,7 @@ func (q *querySpanExtractor) findTableSchema(databaseName, tableName string) (ba
}, nil
}
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &databaseName,
Schema: &emptySchema,
Table: &tableName,
diff --git a/backend/plugin/parser/pg/query_span_extractor.go b/backend/plugin/parser/pg/query_span_extractor.go
index ed5567c02d..040ad8ff5f 100644
--- a/backend/plugin/parser/pg/query_span_extractor.go
+++ b/backend/plugin/parser/pg/query_span_extractor.go
@@ -10,7 +10,6 @@ import (
"github.com/pkg/errors"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
"github.com/bytebase/parser/postgresql"
@@ -187,7 +186,7 @@ func (q *querySpanExtractor) getQuerySpan(ctx context.Context, stmt string) (*ba
if len(stmtmulti.AllStmt()) == 1 {
tableSource, err := q.extractTableSourceFromStmt(stmtmulti.AllStmt()[0])
if err != nil {
- var functionNotSupported *parsererror.FunctionNotSupportedError
+ var functionNotSupported *base.FunctionNotSupportedError
if errors.As(err, &functionNotSupported) {
if len(accessesMap) == 0 {
accessesMap[base.ColumnResource{
@@ -201,7 +200,7 @@ func (q *querySpanExtractor) getQuerySpan(ctx context.Context, stmt string) (*ba
NotFoundError: functionNotSupported,
}, nil
}
- var resourceNotFound *parsererror.ResourceNotFoundError
+ var resourceNotFound *base.ResourceNotFoundError
if errors.As(err, &resourceNotFound) {
if len(accessesMap) == 0 {
accessesMap[base.ColumnResource{
@@ -251,7 +250,7 @@ func (q *querySpanExtractor) findFunctionDefine(schemaName, funcName string, nAr
return nil, errors.Wrapf(err, "failed to get database metadata for database: %s", q.defaultDatabase)
}
if dbMetadata == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &q.defaultDatabase,
}
}
@@ -273,7 +272,7 @@ func (q *querySpanExtractor) findFunctionDefine(schemaName, funcName string, nAr
return nil, errors.Wrapf(err, "failed to get function candidates")
}
if len(candidates) == 0 {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &q.defaultDatabase,
Schema: &schemaName,
Function: &funcName,
@@ -288,7 +287,7 @@ func (q *querySpanExtractor) findFunctionDefine(schemaName, funcName string, nAr
functionName := fmt.Sprintf("%s.%s", function.schemaName, funcName)
columns, err := q.getColumnsFromFunction(functionName, function.metadata.Definition)
if err != nil {
- return nil, &parsererror.FunctionNotSupportedError{
+ return nil, &base.FunctionNotSupportedError{
Err: err,
Function: functionName,
}
@@ -724,7 +723,7 @@ func (*querySpanExtractor) extractLanguageFromCreateFunction(createFuncStmt post
case "plpgsql":
language = languageTypePLPGSQL
default:
- return language, &parsererror.TypeNotSupportedError{
+ return language, &base.TypeNotSupportedError{
Type: "function language",
Name: langText,
Extra: fmt.Sprintf("function: %s", funcName),
@@ -771,7 +770,7 @@ func (*querySpanExtractor) extractAsBodyFromCreateFunction(createFuncStmt postgr
// Check for C-style function definition: AS 'obj_file', 'link_symbol'
// This is a legacy format for C language functions that we don't support
if len(allSconst) > 1 || funcAs.COMMA() != nil {
- return "", &parsererror.TypeNotSupportedError{
+ return "", &base.TypeNotSupportedError{
Type: "function",
Name: funcName,
Extra: "C-style function with object file and link symbol is not supported",
@@ -1216,7 +1215,7 @@ func (q *querySpanExtractor) findTableSchema(schemaName string, tableName string
return nil, errors.Wrapf(err, "failed to get database metadata for database: %s", q.defaultDatabase)
}
if dbMetadata == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &q.defaultDatabase,
}
}
@@ -1228,7 +1227,7 @@ func (q *querySpanExtractor) findTableSchema(schemaName string, tableName string
sequenceSchemaName, sequence := searcher.SearchSequence(tableName)
if table == nil && view == nil && foreignTable == nil && materializedView == nil && sequence == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &q.defaultDatabase,
Schema: &schemaName,
Table: &tableName,
@@ -2828,7 +2827,7 @@ func (q *querySpanExtractor) getColumnsFromColumnRef(ctx postgresql.IColumnrefCo
}
sources, ok := q.getAllTableColumnSources(schemaName, tableName)
if !ok {
- return []base.QuerySpanResult{}, &parsererror.ResourceNotFoundError{
+ return []base.QuerySpanResult{}, &base.ResourceNotFoundError{
Err: errors.New("cannot find the table for star expansion"),
Database: &q.defaultDatabase,
Schema: &schemaName,
@@ -2872,7 +2871,7 @@ func (q *querySpanExtractor) getColumnsFromColumnRef(ctx postgresql.IColumnrefCo
if schemaName == "" {
tableSource := q.findTableInFrom(tableName, columnName)
if tableSource == nil {
- return []base.QuerySpanResult{}, &parsererror.ResourceNotFoundError{
+ return []base.QuerySpanResult{}, &base.ResourceNotFoundError{
Err: errors.New("cannot find the column ref"),
Database: &q.defaultDatabase,
Schema: &schemaName,
@@ -2885,7 +2884,7 @@ func (q *querySpanExtractor) getColumnsFromColumnRef(ctx postgresql.IColumnrefCo
result = append(result, querySpanResult...)
return result, nil
}
- return []base.QuerySpanResult{}, &parsererror.ResourceNotFoundError{
+ return []base.QuerySpanResult{}, &base.ResourceNotFoundError{
Err: errors.New("cannot find the column ref"),
Database: &q.defaultDatabase,
Schema: &schemaName,
@@ -3727,7 +3726,7 @@ func (q *querySpanExtractor) extractTableSourceFromSystemFunctionNew(funcName st
return tableSource, nil
case jsonToRecordset, jsonbToRecordset:
if alias == nil {
- return nil, &parsererror.TypeNotSupportedError{
+ return nil, &base.TypeNotSupportedError{
Extra: fmt.Sprintf("function %s must explicitly define the structure of the record with an AS clause", funcName),
Type: "function",
Name: funcName,
@@ -3783,7 +3782,7 @@ func (q *querySpanExtractor) extractTableSourceFromSystemFunctionNew(funcName st
return tableSource, nil
case jsonPopulateRecord, jsonbPopulateRecord, jsonPopulateRecordset, jsonbPopulateRecordset,
jsonToRecord, jsonbToRecord:
- return nil, &parsererror.TypeNotSupportedError{
+ return nil, &base.TypeNotSupportedError{
Extra: fmt.Sprintf("Unsupport function %s", funcName),
Type: "function",
Name: funcName,
@@ -3791,7 +3790,7 @@ func (q *querySpanExtractor) extractTableSourceFromSystemFunctionNew(funcName st
default:
// For unknown functions, continue with the generic handling below
if alias == nil {
- return nil, &parsererror.TypeNotSupportedError{
+ return nil, &base.TypeNotSupportedError{
Extra: "Use system function result as the table source must have the alias clause to specify table and columns name",
Type: "function",
Name: funcName,
diff --git a/backend/plugin/parser/plsql/query_span_extractor.go b/backend/plugin/parser/plsql/query_span_extractor.go
index 3aa8d72a69..39beb263bd 100644
--- a/backend/plugin/parser/plsql/query_span_extractor.go
+++ b/backend/plugin/parser/plsql/query_span_extractor.go
@@ -10,8 +10,6 @@ import (
parser "github.com/bytebase/parser/plsql"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
-
"github.com/bytebase/bytebase/backend/plugin/parser/base"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -111,7 +109,7 @@ func (q *querySpanExtractor) getQuerySpan(ctx context.Context, statement string)
antlr.ParseTreeWalkerDefault.Walk(listener, tree)
err = listener.err
if err != nil {
- var resourceNotFound *parsererror.ResourceNotFoundError
+ var resourceNotFound *base.ResourceNotFoundError
if errors.As(err, &resourceNotFound) {
if len(columnSet) == 0 {
columnSet[base.ColumnResource{
@@ -373,7 +371,7 @@ func (q *querySpanExtractor) plsqlExtractQueryBlock(ctx parser.IQuery_blockConte
}
}
if !find {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Err: errors.Errorf("failed to find table to calculate asterisk"),
Database: &q.defaultDatabase,
Table: &tableName,
@@ -1276,7 +1274,7 @@ func (q *querySpanExtractor) plsqlFindTableSchema(dbLink []string, schemaName, t
return nil, errors.Wrapf(err, "failed to get linked database metadata for: %s", dbLink)
}
if linkedMeta == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
DatabaseLink: &linkName,
}
}
@@ -1306,7 +1304,7 @@ func (q *querySpanExtractor) plsqlFindTableSchema(dbLink []string, schemaName, t
return nil, errors.Wrapf(err, "failed to get database metadata for: %s", schemaName)
}
if dbMetadata == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &schemaName,
}
}
@@ -1317,7 +1315,7 @@ func (q *querySpanExtractor) plsqlFindTableSchema(dbLink []string, schemaName, t
func (q *querySpanExtractor) findTableSchemaInMetadata(instanceID string, dbMetadata *model.DatabaseMetadata, databaseName, tableName string) (base.TableSource, error) {
schema := dbMetadata.GetSchemaMetadata("")
if schema == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &databaseName,
}
}
@@ -1326,7 +1324,7 @@ func (q *querySpanExtractor) findTableSchemaInMetadata(instanceID string, dbMeta
materializedView := schema.GetMaterializedView(tableName)
foreignTable := schema.GetExternalTable(tableName)
if table == nil && view == nil && materializedView == nil && foreignTable == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &databaseName,
Table: &tableName,
}
diff --git a/backend/plugin/parser/snowflake/query_span_extractor.go b/backend/plugin/parser/snowflake/query_span_extractor.go
index c829150204..893ad528b1 100644
--- a/backend/plugin/parser/snowflake/query_span_extractor.go
+++ b/backend/plugin/parser/snowflake/query_span_extractor.go
@@ -8,8 +8,6 @@ import (
parser "github.com/bytebase/parser/snowflake"
"github.com/pkg/errors"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
-
"github.com/bytebase/bytebase/backend/plugin/parser/base"
)
@@ -98,7 +96,7 @@ func (q *querySpanExtractor) getQuerySpan(ctx context.Context, statement string)
antlr.ParseTreeWalkerDefault.Walk(listener, tree)
err = listener.err
if err != nil {
- var resourceNotFound *parsererror.ResourceNotFoundError
+ var resourceNotFound *base.ResourceNotFoundError
if errors.As(err, &resourceNotFound) {
return &base.QuerySpan{
SourceColumns: accessTables,
diff --git a/backend/plugin/parser/spanner/query_span_extractor.go b/backend/plugin/parser/spanner/query_span_extractor.go
index 86738e9c73..e10588ffa7 100644
--- a/backend/plugin/parser/spanner/query_span_extractor.go
+++ b/backend/plugin/parser/spanner/query_span_extractor.go
@@ -8,8 +8,6 @@ import (
"github.com/antlr4-go/antlr/v4"
parser "github.com/bytebase/parser/googlesql"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
-
"github.com/pkg/errors"
"github.com/bytebase/bytebase/backend/plugin/parser/base"
@@ -734,7 +732,7 @@ func (q *querySpanExtractor) getFieldColumnSource(tableName, fieldName string) (
}
}
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Schema: nil,
Table: &tableName,
Column: &fieldName,
@@ -1114,7 +1112,7 @@ func (q *querySpanExtractor) findTableSchema(schemaName string, tableName string
schema := databaseMetadata.GetSchemaMetadata(schemaName)
if schema == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &q.defaultDatabase,
Schema: &schemaName,
}
diff --git a/backend/plugin/parser/tidb/query_span_extractor.go b/backend/plugin/parser/tidb/query_span_extractor.go
index 4e578092d0..e1699497ad 100644
--- a/backend/plugin/parser/tidb/query_span_extractor.go
+++ b/backend/plugin/parser/tidb/query_span_extractor.go
@@ -8,8 +8,6 @@ import (
tidbast "github.com/pingcap/tidb/pkg/parser/ast"
"github.com/pkg/errors"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
-
"github.com/bytebase/bytebase/backend/plugin/parser/base"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -438,7 +436,7 @@ func (q *querySpanExtractor) extractSelect(node *tidbast.SelectStmt) (base.Table
}
}
if !find {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Err: errors.New("failed to find table to calculate asterisk"),
Database: &field.WildCard.Schema.O,
Table: &field.WildCard.Table.O,
@@ -485,7 +483,7 @@ func (q *querySpanExtractor) extractSourceColumnSetFromExpression(in tidbast.Exp
database, table, column := node.Name.Schema.O, node.Name.Table.O, node.Name.Name.O
sources, ok := q.getFieldColumnSource(database, table, column)
if !ok {
- return base.SourceColumnSet{}, &parsererror.ResourceNotFoundError{
+ return base.SourceColumnSet{}, &base.ResourceNotFoundError{
Err: errors.New("cannot find the column ref"),
Database: &database,
Table: &table,
@@ -802,14 +800,14 @@ func (q *querySpanExtractor) findTableSchema(databaseName string, tableName stri
return nil, errors.Wrapf(err, "failed to get database metadata for %q", databaseName)
}
if dbMetadata == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &databaseName,
}
}
emptySchema := ""
schema := dbMetadata.GetSchemaMetadata("")
if schema == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &databaseName,
Schema: &emptySchema,
}
@@ -849,7 +847,7 @@ func (q *querySpanExtractor) findTableSchema(databaseName string, tableName stri
}
}
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &databaseName,
Schema: &emptySchema,
Table: &tableName,
diff --git a/backend/plugin/parser/trino/query_span_extractor.go b/backend/plugin/parser/trino/query_span_extractor.go
index f89520dd87..cbb95a3c17 100644
--- a/backend/plugin/parser/trino/query_span_extractor.go
+++ b/backend/plugin/parser/trino/query_span_extractor.go
@@ -10,7 +10,6 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/parser/base"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -109,7 +108,7 @@ func (q *querySpanExtractor) getQuerySpan(ctx context.Context, statement string)
antlr.ParseTreeWalkerDefault.Walk(listener, result.Tree)
if listener.err != nil {
- var resourceNotFound *parsererror.ResourceNotFoundError
+ var resourceNotFound *base.ResourceNotFoundError
if errors.As(listener.err, &resourceNotFound) {
return &base.QuerySpan{
Type: queryType,
@@ -257,13 +256,13 @@ func (q *querySpanExtractor) getDatabaseMetadata(database string) (*model.Databa
// Skip if metadata function not provided (for testing)
if q.gCtx.GetDatabaseMetadataFunc == nil {
- return nil, &parsererror.ResourceNotFoundError{Database: &database}
+ return nil, &base.ResourceNotFoundError{Database: &database}
}
// Fetch metadata using the provided function
_, meta, err := q.gCtx.GetDatabaseMetadataFunc(q.ctx, q.gCtx.InstanceID, database)
if err != nil {
- var resourceNotFound *parsererror.ResourceNotFoundError
+ var resourceNotFound *base.ResourceNotFoundError
if errors.As(err, &resourceNotFound) {
return nil, err
}
@@ -298,7 +297,7 @@ func (q *querySpanExtractor) findTableSchema(db, schema, name string) (*model.Ta
// Get schema metadata
schemaMeta := metadata.GetSchemaMetadata(schema)
if schemaMeta == nil {
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &db,
Schema: &schema,
}
@@ -342,7 +341,7 @@ func (q *querySpanExtractor) findTableSchema(db, schema, name string) (*model.Ta
}
// Not found
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &db,
Schema: &schema,
Table: &name,
diff --git a/backend/plugin/parser/tsql/query_span_extractor.go b/backend/plugin/parser/tsql/query_span_extractor.go
index b1271bb3dc..efc3122f52 100644
--- a/backend/plugin/parser/tsql/query_span_extractor.go
+++ b/backend/plugin/parser/tsql/query_span_extractor.go
@@ -11,8 +11,6 @@ import (
"github.com/antlr4-go/antlr/v4"
parser "github.com/bytebase/parser/tsql"
- parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
-
"github.com/pkg/errors"
"github.com/bytebase/bytebase/backend/plugin/parser/base"
@@ -115,7 +113,7 @@ func (q *querySpanExtractor) getQuerySpan(ctx context.Context, statement string)
}
err = listener.err
if err != nil {
- var resourceNotFound *parsererror.ResourceNotFoundError
+ var resourceNotFound *base.ResourceNotFoundError
if errors.As(err, &resourceNotFound) {
return &base.QuerySpan{
Type: queryTypeListener.result,
@@ -543,12 +541,12 @@ func (q *querySpanExtractor) extractTSqlSensitiveFieldsFromTableSourceItem(ctx p
if tempTable, ok := q.gCtx.TempTables[tableName]; ok {
return tempTable, nil
}
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Table: &tableName,
Err: errors.Errorf("temp table %s not found", tableName),
}
} else {
- return nil, &parsererror.TypeNotSupportedError{
+ return nil, &base.TypeNotSupportedError{
Err: errors.Errorf("only full table name in table source item is supported"),
Type: fmt.Sprintf("%v", ctx),
}
@@ -747,7 +745,7 @@ func (q *querySpanExtractor) tsqlFindTableSchema(fullTableName parser.IFull_tabl
}
}
}
- return nil, &parsererror.ResourceNotFoundError{
+ return nil, &base.ResourceNotFoundError{
Database: &normalizedDatabaseName,
Schema: &normalizedSchemaName,
Table: &normalizedTableName,