Merge pull request #133 from makssent/F431_FIX_sharding

F431 FETCH and T321
red-soft-ru · Sep 15, 2024 · 1a72df5 · 1a72df5
2 parents 8787728 + 625968c
commit 1a72df5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/parser/sql/dialect/firebird/src/main/antlr4/imports/firebird/DDLStatement.g4 b/parser/sql/dialect/firebird/src/main/antlr4/imports/firebird/DDLStatement.g4
@@ -504,7 +504,7 @@ outputArgumentList
  ;
 
 assignmentStatement
- : variableName EQ_ simpleExpr
+ : variableName EQ_ expr
  ;
 
 transferStatement
@@ -517,13 +517,13 @@ whileStatement
 
 fetchStatement
  : FETCH cursorName
- INTO COLON_ variable (COMMA_ (COLON_ variable))* SEMI_
+ (INTO COLON_ variable (COMMA_ (COLON_ variable))* SEMI_)?
  | FETCH (NEXT
  | PRIOR
  | FIRST
  | LAST
  | ABSOLUTE NUMBER_
- | RELATIVE NUMBER_ ) FROM cursorName (INTO LBT_ COLON_ RBT_ variable (COMMA_ (LBT_ COLON_ RBT_ variable))* SEMI_)
+ | RELATIVE NUMBER_ ) FROM cursorName (INTO LBT_ COLON_ RBT_ variable (COMMA_ (LBT_ COLON_ RBT_ variable))* SEMI_)?
  ;
 
 ifStatement

diff --git a/...irebird/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/FirebirdStatement.g4 b/...irebird/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/FirebirdStatement.g4
@@ -46,7 +46,6 @@ execute
  | savepoint
  | createTrigger
  | alterTrigger
- | executeBlock
  | createSequence
  | merge
  | createUser