feat: functions blocks, parenthesed JSON Expressions

manticore-projects · manticore-projects · commit 5263b91f3e55 · 2023-05-18T09:11:18.000+07:00
- fixes #1792, the very complex example - fixes #1477 - cosmetics
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -4067,7 +4067,6 @@ JsonExpression JsonExpression() : {
   CastExpression castExpr = null;
 }
 {
-    { System.out.println("Complex:" + getAsBoolean(Feature.allowComplexParsing));}
     (
         LOOKAHEAD(3, {!interrupted}) expr=CaseWhenExpression()
         |
@@ -4092,7 +4091,6 @@ JsonExpression JsonExpression() : {
         LOOKAHEAD(ParenthesedExpression(), {getAsBoolean(Feature.allowComplexParsing)} ) expr = ParenthesedExpression()
         |
         LOOKAHEAD( 3, {getAsBoolean(Feature.allowComplexParsing) && !interrupted}) expr=ParenthesedSelect()
-
     )
 
     (
@@ -6714,6 +6712,9 @@ List<String> captureFunctionBody() {
     tok = getToken(1);
     int l = tokens.size();
     if( tok.kind == EOF || ( foundEnd && tok.kind == ST_SEMICOLON) ) {
+      if (tok.kind == ST_SEMICOLON) {
+        tokens.add(tok.image);
+      }
       break;
     } else if ( l>0 && ( tok.image.equals(".") ||  tokens.get(l-1).endsWith(".")) ) {
         tokens.set(l-1, tokens.get(l-1) + tok.image);
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -61,7 +61,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
 
 import static net.sf.jsqlparser.test.TestUtils.assertDeparse;
 import static net.sf.jsqlparser.test.TestUtils.assertExpressionCanBeDeparsedAs;

Original file line number	Diff line number	Diff line change
`@@ -4067,7 +4067,6 @@ JsonExpression JsonExpression() : {`
`4067`	`4067`	`CastExpression castExpr = null;`
`4068`	`4068`	`}`
`4069`	`4069`	`{`
`4070`		`- { System.out.println("Complex:" + getAsBoolean(Feature.allowComplexParsing));}`
`4071`	`4070`	`(`
`4072`	`4071`	`LOOKAHEAD(3, {!interrupted}) expr=CaseWhenExpression()`
`4073`	`4072`	`\|`
`@@ -4092,7 +4091,6 @@ JsonExpression JsonExpression() : {`
`4092`	`4091`	`LOOKAHEAD(ParenthesedExpression(), {getAsBoolean(Feature.allowComplexParsing)} ) expr = ParenthesedExpression()`
`4093`	`4092`	`\|`
`4094`	`4093`	`LOOKAHEAD( 3, {getAsBoolean(Feature.allowComplexParsing) && !interrupted}) expr=ParenthesedSelect()`
`4095`		`-`
`4096`	`4094`	`)`
`4097`	`4095`
`4098`	`4096`	`(`
`@@ -6714,6 +6712,9 @@ List<String> captureFunctionBody() {`
`6714`	`6712`	`tok = getToken(1);`
`6715`	`6713`	`int l = tokens.size();`
`6716`	`6714`	`if( tok.kind == EOF \|\| ( foundEnd && tok.kind == ST_SEMICOLON) ) {`
	`6715`	`+ if (tok.kind == ST_SEMICOLON) {`
	`6716`	`+ tokens.add(tok.image);`
	`6717`	`+ }`
`6717`	`6718`	`break;`
`6718`	`6719`	`} else if ( l>0 && ( tok.image.equals(".") \|\| tokens.get(l-1).endsWith(".")) ) {`
`6719`	`6720`	`tokens.set(l-1, tokens.get(l-1) + tok.image);`