Skip to content

Commit 4cd8881

Browse files
authored
fix: revert SQL grammar changes and disable deep level JSON insert tests (ArcadeData#2961)
1 parent 8f9ac7f commit 4cd8881

4 files changed

Lines changed: 5208 additions & 3689 deletions

File tree

engine/src/main/grammar/SQLGrammar.jjt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,9 +1717,6 @@ Expression Expression():
17171717
{Token token; }
17181718
{
17191719
(
1720-
LOOKAHEAD(1, {getToken(1).kind == LBRACE})
1721-
jjtThis.json = Json() {jjtThis.value = jjtThis.json; }
1722-
|
17231720
LOOKAHEAD( ArrayConcatExpression() )
17241721
jjtThis.arrayConcatExpression = ArrayConcatExpression() { jjtThis.value = jjtThis.arrayConcatExpression; }
17251722
|
@@ -1732,12 +1729,15 @@ Expression Expression():
17321729
LOOKAHEAD( Rid() )
17331730
jjtThis.rid = Rid() { jjtThis.value = jjtThis.rid; }
17341731
|
1735-
LOOKAHEAD(3)
1732+
LOOKAHEAD( <LPAREN> WhereClause() <RPAREN> )
17361733
<LPAREN>
17371734
jjtThis.whereCondition = WhereClause() {jjtThis.value = jjtThis.whereCondition; }
17381735
<RPAREN>
17391736
|
1737+
LOOKAHEAD( MathExpression() )
17401738
jjtThis.mathExpression = MathExpression() { jjtThis.value = jjtThis.mathExpression; }
1739+
|
1740+
jjtThis.json = Json() {jjtThis.value = jjtThis.json; }
17411741
)
17421742
{ return jjtThis; }
17431743
}
@@ -1762,9 +1762,6 @@ ArrayConcatExpressionElement ArrayConcatExpressionElement():
17621762
{Token token; }
17631763
{
17641764
(
1765-
LOOKAHEAD(1, {getToken(1).kind == LBRACE})
1766-
jjtThis.json = Json() {jjtThis.value = jjtThis.json; }
1767-
|
17681765
LOOKAHEAD(2) <NULL> {jjtThis.isNull = true; jjtThis.value = null;}
17691766
|
17701767
<TRUE> { jjtThis.booleanValue = true; jjtThis.value = true; }
@@ -1774,7 +1771,10 @@ ArrayConcatExpressionElement ArrayConcatExpressionElement():
17741771
LOOKAHEAD( Rid() )
17751772
jjtThis.rid = Rid() { jjtThis.value = jjtThis.rid; }
17761773
|
1774+
LOOKAHEAD( MathExpression() )
17771775
jjtThis.mathExpression = MathExpression() { jjtThis.value = jjtThis.mathExpression; }
1776+
|
1777+
jjtThis.json = Json() {jjtThis.value = jjtThis.json; }
17781778

17791779
)
17801780
[ jjtThis.nestedProjection = NestedProjection() ]

0 commit comments

Comments
 (0)