Skip to content

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

fix(elasticsearch): handle parsing errors in GetQuerySpan (#19335)

h3n4l5fd7db10ea4b
diff --git a/backend/plugin/parser/elasticsearch/query_span.go b/backend/plugin/parser/elasticsearch/query_span.go
index bcd327374c..d36cabc126 100644
--- a/backend/plugin/parser/elasticsearch/query_span.go
+++ b/backend/plugin/parser/elasticsearch/query_span.go
@@ -3,6 +3,8 @@ package elasticsearch
import (
"context"
+ "github.com/pkg/errors"
+
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/parser/base"
)
@@ -19,9 +21,21 @@ func GetQuerySpan(
_, _ string,
_ bool,
) (*base.QuerySpan, error) {
- parseResult, _ := ParseElasticsearchREST(stmt.Text)
+ parseResult, err := ParseElasticsearchREST(stmt.Text)
+ if err != nil {
+ return nil, err
+ }
+
+ if parseResult == nil {
+ return &base.QuerySpan{Type: base.QueryTypeUnknown}, nil
+ }
+
+ if len(parseResult.Errors) > 0 {
+ firstErr := parseResult.Errors[0]
+ return nil, errors.Errorf("syntax error at line %d, column %d: %s", firstErr.Position.Line, firstErr.Position.Column, firstErr.Message)
+ }
- if parseResult == nil || len(parseResult.Requests) == 0 {
+ if len(parseResult.Requests) == 0 {
return &base.QuerySpan{Type: base.QueryTypeUnknown}, nil
}
diff --git a/backend/plugin/parser/elasticsearch/query_span_test.go b/backend/plugin/parser/elasticsearch/query_span_test.go
index 1371b84b8d..a7aa4b5302 100644
--- a/backend/plugin/parser/elasticsearch/query_span_test.go
+++ b/backend/plugin/parser/elasticsearch/query_span_test.go
@@ -56,3 +56,14 @@ func TestGetQuerySpan(t *testing.T) {
a.NoError(err)
}
}
+
+func TestGetQuerySpan_Error(t *testing.T) {
+ // MongoDB style query, definitely not ElasticSearch
+ stmt := "db.users.find({})"
+ span, err := GetQuerySpan(context.Background(), base.GetQuerySpanContext{}, base.Statement{Text: stmt}, "", "", false)
+
+ // New behavior: returns error
+ require.Error(t, err)
+ require.Nil(t, span)
+ require.Contains(t, err.Error(), "Syntax error")
+}
diff --git a/backend/plugin/parser/elasticsearch/test-data/query_span.yaml b/backend/plugin/parser/elasticsearch/test-data/query_span.yaml
index 6f36c94e90..7e4c3b107e 100644
--- a/backend/plugin/parser/elasticsearch/test-data/query_span.yaml
+++ b/backend/plugin/parser/elasticsearch/test-data/query_span.yaml
@@ -189,8 +189,3 @@
- description: PATCH document
statement: "PATCH /my_index/_doc/1"
queryType: 5 # DML
-
-# Unknown method
-- description: Unknown method
- statement: "UNKNOWN /my_index"
- queryType: 0 # QueryTypeUnknown