@@ -607,10 +607,10 @@ DeclareStatement Declare(): {
607
607
(
608
608
( <K_TABLE> "(" colDef = ColumnDefinition()
609
609
{
610
- stmt.withUserVariable(userVariable)
611
- .withDeclareType(DeclareType.TABLE)
612
- .addColumnDefinition(colDef);
613
- }
610
+ stmt.withUserVariable(userVariable)
611
+ .withDeclareType(DeclareType.TABLE)
612
+ .addColumnDefinition(colDef);
613
+ }
614
614
("," colDef = ColumnDefinition() { stmt.addColumnDefinition(colDef); })* ")"
615
615
)
616
616
|
@@ -1475,8 +1475,8 @@ PlainSelect PlainSelect() #PlainSelect:
1475
1475
1476
1476
[LOOKAHEAD(2) first = First() { plainSelect.setFirst(first); } ]
1477
1477
1478
- [
1479
- <K_ALL>
1478
+ [ LOOKAHEAD(2)
1479
+ ( <K_ALL>
1480
1480
|
1481
1481
(
1482
1482
<K_DISTINCT> { Distinct distinct = new Distinct(); plainSelect.setDistinct(distinct); }
@@ -1494,6 +1494,7 @@ PlainSelect PlainSelect() #PlainSelect:
1494
1494
(
1495
1495
<K_SQL_NO_CACHE> { plainSelect.setMySqlSqlNoCache(true); }
1496
1496
)
1497
+ )
1497
1498
]
1498
1499
1499
1500
[ LOOKAHEAD(2) top = Top() { plainSelect.setTop(top); } ]
@@ -2606,9 +2607,9 @@ Expression Condition():
2606
2607
{
2607
2608
[ LOOKAHEAD(2) (<K_NOT> { not=true; } | "!" { not=true; exclamationMarkNot=true; })]
2608
2609
(
2609
- LOOKAHEAD(SQLCondition ()) result=SQLCondition ()
2610
- | LOOKAHEAD(RegularCondition()) result=RegularCondition ()
2611
- | result=SimpleExpression()
2610
+ LOOKAHEAD(RegularCondition ()) result=RegularCondition ()
2611
+ | result=SQLCondition ()
2612
+ // | result=SimpleExpression()
2612
2613
)
2613
2614
2614
2615
{ return not?new NotExpression(result, exclamationMarkNot):result; }
@@ -2687,13 +2688,13 @@ Expression SQLCondition():
2687
2688
(
2688
2689
result=ExistsExpression()
2689
2690
| LOOKAHEAD(InExpression()) result=InExpression()
2690
- | left = SimpleExpression()
2691
- (LOOKAHEAD(2) result=Between(left)
2691
+ | left = SimpleExpression() { result = left; }
2692
+ [ LOOKAHEAD(2) ( (LOOKAHEAD(2) result=Between(left)
2692
2693
| LOOKAHEAD(IsNullExpression()) result=IsNullExpression(left)
2693
2694
| LOOKAHEAD(IsBooleanExpression()) result=IsBooleanExpression(left)
2694
2695
| LOOKAHEAD(2) result=LikeExpression(left)
2695
2696
| result=SimilarToExpression(left)
2696
- )
2697
+ )) ]
2697
2698
)
2698
2699
{ return result; }
2699
2700
}
0 commit comments