Skip to content

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

chore: upgrade oracle parser (#18042)

rebelice6eaf60b837af
diff --git a/backend/plugin/parser/plsql/split.go b/backend/plugin/parser/plsql/split.go
index 4832f1174e..a0bc33564a 100644
--- a/backend/plugin/parser/plsql/split.go
+++ b/backend/plugin/parser/plsql/split.go
@@ -141,7 +141,8 @@ func isCallStatement(item antlr.Tree) bool {
if !ok {
return false
}
- return unitStmt.Call_statement() != nil
+ // BYT-8268: Changed from Call_statement to Sql_call_statement
+ return unitStmt.Sql_call_statement() != nil
}
// needSemicolon returns true if the given statement needs a semicolon.
diff --git a/backend/plugin/parser/plsql/split_test.go b/backend/plugin/parser/plsql/split_test.go
index 5a4dd41414..c4b6a28384 100644
--- a/backend/plugin/parser/plsql/split_test.go
+++ b/backend/plugin/parser/plsql/split_test.go
@@ -69,6 +69,154 @@ ONLINE;`,
},
},
},
+ // BYT-8268: Test cases for CALL keyword requirement
+ // This prevents misidentifying keywords like CASCADE as procedure calls
+ {
+ statement: "DROP TABLESPACE xxx CASCADE",
+ want: resData{
+ err: "Syntax error at line 1:28 \nrelated text: DROP TABLESPACE xxx CASCADE;",
+ },
+ },
+ {
+ statement: "DROP TABLESPACE xxx; CASCADE",
+ want: resData{
+ err: "Syntax error at line 1:29 \nrelated text: DROP TABLESPACE xxx; CASCADE;",
+ },
+ },
+ {
+ statement: "DROP TABLESPACE xxx INCLUDING CONTENTS CASCADE CONSTRAINTS",
+ want: resData{
+ res: []base.SingleSQL{
+ {
+ Text: "DROP TABLESPACE xxx INCLUDING CONTENTS CASCADE CONSTRAINTS",
+ Start: &storepb.Position{Line: 1, Column: 1},
+ End: &storepb.Position{Line: 1, Column: 48},
+ ByteOffsetEnd: 58,
+ },
+ },
+ },
+ },
+ {
+ statement: "CALL my_procedure()",
+ want: resData{
+ res: []base.SingleSQL{
+ {
+ Text: "CALL my_procedure()",
+ Start: &storepb.Position{Line: 1, Column: 1},
+ End: &storepb.Position{Line: 1, Column: 19},
+ ByteOffsetEnd: 19,
+ },
+ },
+ },
+ },
+ {
+ statement: "SELECT * FROM t1; SELECT * FROM t2",
+ want: resData{
+ res: []base.SingleSQL{
+ {
+ Text: "SELECT * FROM t1",
+ Start: &storepb.Position{Line: 1, Column: 1},
+ End: &storepb.Position{Line: 1, Column: 15},
+ ByteOffsetStart: 0,
+ ByteOffsetEnd: 16,
+ },
+ {
+ Text: "SELECT * FROM t2",
+ Start: &storepb.Position{Line: 1, Column: 19},
+ End: &storepb.Position{Line: 1, Column: 33},
+ ByteOffsetStart: 18,
+ ByteOffsetEnd: 34,
+ },
+ },
+ },
+ },
+ // Test forward slash (/) as statement separator in PL/SQL
+ {
+ statement: `CREATE OR REPLACE PROCEDURE test_proc IS
+BEGIN
+ CALL DBMS_OUTPUT.PUT_LINE('Hello');
+END;
+/`,
+ want: resData{
+ res: []base.SingleSQL{
+ {
+ Text: "CREATE OR REPLACE PROCEDURE test_proc IS\nBEGIN\n CALL DBMS_OUTPUT.PUT_LINE('Hello');\nEND;",
+ Start: &storepb.Position{Line: 1, Column: 1},
+ End: &storepb.Position{Line: 4, Column: 4},
+ ByteOffsetEnd: 91,
+ },
+ },
+ },
+ },
+ {
+ statement: `CREATE OR REPLACE PROCEDURE proc1 IS
+BEGIN
+ NULL;
+END;
+/
+CREATE OR REPLACE PROCEDURE proc2 IS
+BEGIN
+ NULL;
+END;
+/`,
+ want: resData{
+ res: []base.SingleSQL{
+ {
+ Text: "CREATE OR REPLACE PROCEDURE proc1 IS\nBEGIN\n NULL;\nEND;",
+ Start: &storepb.Position{Line: 1, Column: 1},
+ End: &storepb.Position{Line: 4, Column: 4},
+ ByteOffsetStart: 0,
+ ByteOffsetEnd: 57,
+ },
+ {
+ Text: "CREATE OR REPLACE PROCEDURE proc2 IS\nBEGIN\n NULL;\nEND;",
+ Start: &storepb.Position{Line: 6, Column: 1},
+ End: &storepb.Position{Line: 9, Column: 4},
+ ByteOffsetStart: 60,
+ ByteOffsetEnd: 117,
+ },
+ },
+ },
+ },
+ {
+ statement: `SELECT * FROM t1;
+/
+SELECT * FROM t2;`,
+ want: resData{
+ res: []base.SingleSQL{
+ {
+ Text: "SELECT * FROM t1",
+ Start: &storepb.Position{Line: 1, Column: 1},
+ End: &storepb.Position{Line: 1, Column: 15},
+ ByteOffsetStart: 0,
+ ByteOffsetEnd: 16,
+ },
+ {
+ Text: "SELECT * FROM t2",
+ Start: &storepb.Position{Line: 3, Column: 1},
+ End: &storepb.Position{Line: 3, Column: 15},
+ ByteOffsetStart: 20,
+ ByteOffsetEnd: 36,
+ },
+ },
+ },
+ },
+ {
+ statement: `BEGIN
+ CALL DBMS_OUTPUT.PUT_LINE('Test');
+END;
+/`,
+ want: resData{
+ res: []base.SingleSQL{
+ {
+ Text: "BEGIN\n CALL DBMS_OUTPUT.PUT_LINE('Test');\nEND;",
+ Start: &storepb.Position{Line: 1, Column: 1},
+ End: &storepb.Position{Line: 3, Column: 4},
+ ByteOffsetEnd: 49,
+ },
+ },
+ },
+ },
}
for _, test := range tests {
diff --git a/go.mod b/go.mod
index 3807cd3393..11d2899e56 100644
--- a/go.mod
+++ b/go.mod
@@ -293,7 +293,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.39.0
github.com/aws/smithy-go v1.23.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
- github.com/bytebase/parser v0.0.0-20251110090839-e7e9eb80d22c
+ github.com/bytebase/parser v0.0.0-20251110095732-1f0027a46f16
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
github.com/cockroachdb/cockroach-go/v2 v2.4.2
@@ -384,6 +384,7 @@ replace (
// Hive fix.
github.com/beltran/gohive => github.com/bytebase/gohive v0.0.0-20240422092929-d76993a958a4
github.com/beltran/gosasl => github.com/bytebase/gosasl v0.0.0-20240422091407-6b7481e86f08
+
// copied from pingcap/tidb
// fix potential security issue(CVE-2020-26160) introduced by indirect dependency.
github.com/dgrijalva/jwt-go => github.com/form3tech-oss/jwt-go v3.2.6-0.20210809144907-32ab6a8243d7+incompatible
diff --git a/go.sum b/go.sum
index 81ae9dc232..8645177ca0 100644
--- a/go.sum
+++ b/go.sum
@@ -853,8 +853,8 @@ github.com/bytebase/gosasl v0.0.0-20240422091407-6b7481e86f08 h1:S1GgjJLspz4E4z4
github.com/bytebase/gosasl v0.0.0-20240422091407-6b7481e86f08/go.mod h1:Qx8cW6jkI8riyzmklj80kAIkv+iezFUTBiGU0qHhHes=
github.com/bytebase/lsp-protocol v0.0.0-20250324071136-1586d0c10ff0 h1:bJ8NSf2K+pccl5m/wuu97fiYjDwpJH6IzURAq/3XA2U=
github.com/bytebase/lsp-protocol v0.0.0-20250324071136-1586d0c10ff0/go.mod h1:BEWMfiZtqshdmulKJcIsWb45MUaEvDO4CROcgi8dfFg=
-github.com/bytebase/parser v0.0.0-20251110090839-e7e9eb80d22c h1:ci7hWZ8vb/iKkuEnjTdEoYgxVZgkLrr7n032RUH3t8I=
-github.com/bytebase/parser v0.0.0-20251110090839-e7e9eb80d22c/go.mod h1:jeak/EfutSOAuWKvrFIT2IZunhWprM7oTFBRgZ9RCxo=
+github.com/bytebase/parser v0.0.0-20251110095732-1f0027a46f16 h1:sjth6iocuBUU/Afu2/Hfhmz8nCiyXBBS34Zoj5FclT4=
+github.com/bytebase/parser v0.0.0-20251110095732-1f0027a46f16/go.mod h1:jeak/EfutSOAuWKvrFIT2IZunhWprM7oTFBRgZ9RCxo=
github.com/bytebase/pgx/v5 v5.0.0-20250212161523-96ff8aed8767 h1:YuR5G3LcxpO5ScSTA+Kdirxg9RW4TRc/v1t7N2Hfmbw=
github.com/bytebase/pgx/v5 v5.0.0-20250212161523-96ff8aed8767/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
github.com/bytebase/pkcs8 v0.0.0-20240612095628-fcd0a7484c94 h1:6PNsuNmSqCuR8Z616uQLzDIvujWCFsKzeVc3ECmVubk=