feat: ParenthesedSelectBody and ParenthesedFromItem

- extract `OrderByElements` into `SelectBody` - one more special Oracle Test succeeds - all tests succeed
JSQLParser · wumpz · Apr 27, 2023 · Dec 11, 2022 · Dec 22, 2022 · Jan 8, 2023
commit 465934c4eb12d8a3272e1b8f8a80d1cbe2fe78f0
diff --git a/src/main/java/net/sf/jsqlparser/expression/OracleHint.java b/src/main/java/net/sf/jsqlparser/expression/OracleHint.java
@@ -23,15 +23,14 @@
 public class OracleHint extends ASTNodeAccessImpl implements Expression {
 
     private static final Pattern SINGLE_LINE = Pattern.compile("--\\+ *([^ ].*[^ ])");
-    private static final Pattern MULTI_LINE = Pattern.
-            compile("\\/\\*\\+ *([^ ].*[^ ]) *\\*+\\/", Pattern.MULTILINE | Pattern.DOTALL);
+    private static final Pattern MULTI_LINE =
+            Pattern.compile("\\/\\*\\+ *([^ ].*[^ ]) *\\*+\\/", Pattern.MULTILINE | Pattern.DOTALL);
 
     private String value;
     private boolean singleLine = false;
 
     public static boolean isHintMatch(String comment) {
-        return SINGLE_LINE.matcher(comment).find()
-                || MULTI_LINE.matcher(comment).find();
+        return SINGLE_LINE.matcher(comment).find() || MULTI_LINE.matcher(comment).find();
     }
 
     public final void setComment(String comment) {
@@ -94,7 +93,7 @@ public static OracleHint getHintFromSelectBody(SelectBody selectBody) {
         if (selectBody instanceof PlainSelect) {
             return ((PlainSelect) selectBody).getOracleHint();
         } else if (selectBody instanceof ParenthesedSelectBody) {
-            return getHintFromSelectBody( ((ParenthesedSelectBody) selectBody).getSelectBody() );
+            return getHintFromSelectBody(((ParenthesedSelectBody) selectBody).getSelectBody());
         } else {
             return null;
         }

diff --git a/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java b/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java
@@ -35,8 +35,7 @@
 public final class CCJSqlParserUtil {
     public final static int ALLOWED_NESTING_DEPTH = 10;
 
-    private CCJSqlParserUtil() {
-    }
+    private CCJSqlParserUtil() {}
 
     public static Statement parse(Reader statementReader) throws JSQLParserException {
         CCJSqlParser parser = new CCJSqlParser(new StreamProvider(statementReader));
@@ -48,8 +47,7 @@ public static Statement parse(String sql) throws JSQLParserException {
     }
 
     /**
-     * Parses an sql statement while allowing via consumer to configure the used
-     * parser before.
+     * Parses an sql statement while allowing via consumer to configure the used parser before.
      *
      * For instance to activate SQLServer bracket quotation on could use:
      *
@@ -62,7 +60,8 @@ public static Statement parse(String sql) throws JSQLParserException {
      * @return
      * @throws JSQLParserException
      */
-    public static Statement parse(String sql, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
+    public static Statement parse(String sql, Consumer<CCJSqlParser> consumer)
+            throws JSQLParserException {
         Statement statement = null;
 
         // first, try to parse fast and simple
@@ -73,7 +72,7 @@ public static Statement parse(String sql, Consumer<CCJSqlParser> consumer) throw
             }
             statement = parseStatement(parser);
         } catch (JSQLParserException ex) {
-            if (getNestingDepth(sql)<=ALLOWED_NESTING_DEPTH) {
+            if (getNestingDepth(sql) <= ALLOWED_NESTING_DEPTH) {
                 CCJSqlParser parser = newParser(sql).withAllowComplexParsing(true);
                 if (consumer != null) {
                     consumer.accept(parser);
@@ -130,13 +129,15 @@ public static Expression parseExpression(String expression) throws JSQLParserExc
         return parseExpression(expression, true);
     }
 
-    public static Expression parseExpression(String expression, boolean allowPartialParse) throws JSQLParserException {
+    public static Expression parseExpression(String expression, boolean allowPartialParse)
+            throws JSQLParserException {
         return parseExpression(expression, allowPartialParse, p -> {
         });
     }
 
     @SuppressWarnings("PMD.CyclomaticComplexity")
-    public static Expression parseExpression(String expressionStr, boolean allowPartialParse, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
+    public static Expression parseExpression(String expressionStr, boolean allowPartialParse,
+            Consumer<CCJSqlParser> consumer) throws JSQLParserException {
         Expression expression = null;
 
         // first, try to parse fast and simple
@@ -148,22 +149,26 @@ public static Expression parseExpression(String expressionStr, boolean allowPart
             try {
                 expression = parser.Expression();
                 if (parser.getNextToken().kind != CCJSqlParserTokenManager.EOF) {
-                    throw new JSQLParserException("could only parse partial expression " + expression.toString());
+                    throw new JSQLParserException(
+                            "could only parse partial expression " + expression.toString());
                 }
             } catch (ParseException ex) {
                 throw new JSQLParserException(ex);
             }
         } catch (JSQLParserException ex1) {
-            // when fast simple parsing fails, try complex parsing but only if it has a chance to succeed
-            if (getNestingDepth(expressionStr)<=ALLOWED_NESTING_DEPTH) {
+            // when fast simple parsing fails, try complex parsing but only if it has a chance to
+            // succeed
+            if (getNestingDepth(expressionStr) <= ALLOWED_NESTING_DEPTH) {
                 CCJSqlParser parser = newParser(expressionStr).withAllowComplexParsing(true);
                 if (consumer != null) {
                     consumer.accept(parser);
                 }
                 try {
                     expression = parser.Expression();
-                    if (!allowPartialParse && parser.getNextToken().kind != CCJSqlParserTokenManager.EOF) {
-                        throw new JSQLParserException("could only parse partial expression " + expression.toString());
+                    if (!allowPartialParse
+                            && parser.getNextToken().kind != CCJSqlParserTokenManager.EOF) {
+                        throw new JSQLParserException(
+                                "could only parse partial expression " + expression.toString());
                     }
                 } catch (JSQLParserException ex) {
                     throw ex;
@@ -176,8 +181,8 @@ public static Expression parseExpression(String expressionStr, boolean allowPart
     }
 
     /**
-     * Parse an conditional expression. This is the expression after a where
-     * clause. Partial parsing is enabled.
+     * Parse an conditional expression. This is the expression after a where clause. Partial parsing
+     * is enabled.
      *
      * @param condExpr
      * @return the expression parsed
@@ -188,47 +193,53 @@ public static Expression parseCondExpression(String condExpr) throws JSQLParserE
     }
 
     /**
-     * Parse an conditional expression. This is the expression after a where
-     * clause.
+     * Parse an conditional expression. This is the expression after a where clause.
      *
      * @param condExpr
      * @param allowPartialParse false: needs the whole string to be processed.
      * @return the expression parsed
      * @see #parseCondExpression(String)
      */
-    public static Expression parseCondExpression(String condExpr, boolean allowPartialParse) throws JSQLParserException {
+    public static Expression parseCondExpression(String condExpr, boolean allowPartialParse)
+            throws JSQLParserException {
         return parseCondExpression(condExpr, allowPartialParse, p -> {
         });
     }
 
     @SuppressWarnings("PMD.CyclomaticComplexity")
-    public static Expression parseCondExpression(String conditionalExpressionStr, boolean allowPartialParse, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
+    public static Expression parseCondExpression(String conditionalExpressionStr,
+            boolean allowPartialParse, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
         Expression expression = null;
 
         // first, try to parse fast and simple
         try {
-            CCJSqlParser parser = newParser(conditionalExpressionStr).withAllowComplexParsing(false);
+            CCJSqlParser parser =
+                    newParser(conditionalExpressionStr).withAllowComplexParsing(false);
             if (consumer != null) {
                 consumer.accept(parser);
             }
             try {
                 expression = parser.Expression();
                 if (parser.getNextToken().kind != CCJSqlParserTokenManager.EOF) {
-                    throw new JSQLParserException("could only parse partial expression " + expression.toString());
+                    throw new JSQLParserException(
+                            "could only parse partial expression " + expression.toString());
                 }
             } catch (ParseException ex) {
                 throw new JSQLParserException(ex);
             }
-        }  catch (JSQLParserException ex1) {
-            if (getNestingDepth(conditionalExpressionStr)<=ALLOWED_NESTING_DEPTH) {
-                CCJSqlParser parser = newParser(conditionalExpressionStr).withAllowComplexParsing(true);
+        } catch (JSQLParserException ex1) {
+            if (getNestingDepth(conditionalExpressionStr) <= ALLOWED_NESTING_DEPTH) {
+                CCJSqlParser parser =
+                        newParser(conditionalExpressionStr).withAllowComplexParsing(true);
                 if (consumer != null) {
                     consumer.accept(parser);
                 }
                 try {
                     expression = parser.Expression();
-                    if (!allowPartialParse && parser.getNextToken().kind != CCJSqlParserTokenManager.EOF) {
-                        throw new JSQLParserException("could only parse partial expression " + expression.toString());
+                    if (!allowPartialParse
+                            && parser.getNextToken().kind != CCJSqlParserTokenManager.EOF) {
+                        throw new JSQLParserException(
+                                "could only parse partial expression " + expression.toString());
                     }
                 } catch (JSQLParserException ex) {
                     throw ex;
@@ -257,7 +268,8 @@ public Statement call() throws Exception {
             });
             executorService.shutdown();
 
-            statement = future.get( parser.getConfiguration().getAsInteger(Feature.timeOut), TimeUnit.MILLISECONDS);
+            statement = future.get(parser.getConfiguration().getAsInteger(Feature.timeOut),
+                    TimeUnit.MILLISECONDS);
         } catch (TimeoutException ex) {
             parser.interrupted = true;
             throw new JSQLParserException("Time out occurred.", ex);
@@ -281,7 +293,8 @@ public static Statements parseStatements(String sqls) throws JSQLParserException
      *
      * @return the statements parsed
      */
-    public static Statements parseStatements(String sqls, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
+    public static Statements parseStatements(String sqls, Consumer<CCJSqlParser> consumer)
+            throws JSQLParserException {
         Statements statements = null;
 
         // first, try to parse fast and simple
@@ -292,8 +305,9 @@ public static Statements parseStatements(String sqls, Consumer<CCJSqlParser> con
             }
             statements = parseStatements(parser);
         } catch (JSQLParserException ex) {
-            // when fast simple parsing fails, try complex parsing but only if it has a chance to succeed
-            if (getNestingDepth(sqls)<=ALLOWED_NESTING_DEPTH) {
+            // when fast simple parsing fails, try complex parsing but only if it has a chance to
+            // succeed
+            if (getNestingDepth(sqls) <= ALLOWED_NESTING_DEPTH) {
                 CCJSqlParser parser = newParser(sqls).withAllowComplexParsing(true);
                 if (consumer != null) {
                     consumer.accept(parser);
@@ -321,7 +335,8 @@ public Statements call() throws Exception {
             });
             executorService.shutdown();
 
-            statements = future.get( parser.getConfiguration().getAsInteger(Feature.timeOut) , TimeUnit.MILLISECONDS);
+            statements = future.get(parser.getConfiguration().getAsInteger(Feature.timeOut),
+                    TimeUnit.MILLISECONDS);
         } catch (TimeoutException ex) {
             parser.interrupted = true;
             throw new JSQLParserException("Time out occurred.", ex);
@@ -331,7 +346,8 @@ public Statements call() throws Exception {
         return statements;
     }
 
-    public static void streamStatements(StatementListener listener, InputStream is, String encoding) throws JSQLParserException {
+    public static void streamStatements(StatementListener listener, InputStream is, String encoding)
+            throws JSQLParserException {
         try {
             CCJSqlParser parser = newParser(is, encoding);
             while (true) {
@@ -349,27 +365,27 @@ public static void streamStatements(StatementListener listener, InputStream is,
             throw new JSQLParserException(ex);
         }
     }
-    
+
     public static int getNestingDepth(String sql) {
-      int maxlevel=0;  
-      int level=0;
-      
-      char[] chars = sql.toCharArray();
-      for (char c:chars) {
-          switch(c) {
-              case '(':
-                level++;
-                break;
-              case ')':
-                if (maxlevel<level) {
-                    maxlevel = level;
-                }
-                level--;
-                break;
-              default:
-                // Codazy/PMD insists in a Default statement
-          }
-      }
-      return maxlevel;
+        int maxlevel = 0;
+        int level = 0;
+
+        char[] chars = sql.toCharArray();
+        for (char c : chars) {
+            switch (c) {
+                case '(':
+                    level++;
+                    break;
+                case ')':
+                    if (maxlevel < level) {
+                        maxlevel = level;
+                    }
+                    level--;
+                    break;
+                default:
+                    // Codazy/PMD insists in a Default statement
+            }
+        }
+        return maxlevel;
     }
 }