feat: functions blocks, parenthesed JSON Expressions

- fixes JSQLParser#1792, the very complex example - fixes JSQLParser#1477 - cosmetics
manticore-projects · May 18, 2023 · 5263b91 · 5263b91
1 parent e19dc0e
commit 5263b91
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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;