feat: ParenthesedSelectBody and ParenthesedFromItem

- First properly working version - Work in progress, 13 tests failing
JSQLParser · wumpz · Apr 27, 2023 · Dec 11, 2022 · Dec 22, 2022 · Jan 8, 2023
commit e460cda3dd94da60b02264902429c68848f5f8ac
diff --git a/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java b/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java
@@ -79,6 +79,8 @@ public static Statement parse(String sql, Consumer<CCJSqlParser> consumer) throw
                     consumer.accept(parser);
                 }
                 statement = parseStatement(parser);
+            } else {
+                throw ex;
             }
         }
         return statement;

diff --git a/src/main/java/net/sf/jsqlparser/parser/feature/Feature.java b/src/main/java/net/sf/jsqlparser/parser/feature/Feature.java
@@ -113,6 +113,7 @@ public enum Feature {
     limitOffset,
     /**
      * "OFFSET offset"
+     * 
      * @see Offset
      */
     offset,
@@ -129,12 +130,12 @@ public enum Feature {
     fetch,
     /**
      * "FETCH FIRST row_count (ROW | ROWS) ONLY"
+     * 
      * @see Fetch#isFetchParamFirst()
      */
     fetchFirst,
     /**
-     * "FETCH NEXT row_count (ROW | ROWS) ONLY"
-     * if not {@link #fetchFirst}
+     * "FETCH NEXT row_count (ROW | ROWS) ONLY" if not {@link #fetchFirst}
      *
      * @see Fetch#isFetchParamFirst()
      */
@@ -193,8 +194,7 @@ public enum Feature {
      */
     joinApply,
 
-    joinWindow,
-    joinUsingColumns,
+    joinWindow, joinUsingColumns,
 
     /**
      * "SKIP variable" | "SKIP ?" | "SKIP rowCount"
@@ -203,9 +203,7 @@ public enum Feature {
      */
     skip,
     /**
-     * "FIRST" \?|[0-9]+|variable
-     * or
-     * "LIMIT" \?|[0-9]+|variable
+     * "FIRST" \?|[0-9]+|variable or "LIMIT" \?|[0-9]+|variable
      *
      * @see First
      */
@@ -328,9 +326,7 @@ public enum Feature {
     /**
      * UPDATE table SET (col, ...) = (SELECT col, ... )"
      */
-    updateUseSelect,
-    updateOrderBy,
-    updateLimit,
+    updateUseSelect, updateOrderBy, updateLimit,
     /**
      * "RETURNING expr(, expr)*"
      *
@@ -429,8 +425,7 @@ public enum Feature {
      *
      * @see Execute
      */
-    execute,
-    executeExec, executeCall, executeExecute,
+    execute, executeExec, executeCall, executeExecute,
 
     /**
      * SQL "EXECUTE" statement is allowed
@@ -454,13 +449,7 @@ public enum Feature {
      *
      * @see Drop
      */
-    drop,
-    dropTable,
-    dropIndex,
-    dropView,
-    dropSchema,
-    dropSequence,
-    dropTableIfExists, dropIndexIfExists, dropViewIfExists, dropSchemaIfExists, dropSequenceIfExists,
+    drop, dropTable, dropIndex, dropView, dropSchema, dropSequence, dropTableIfExists, dropIndexIfExists, dropViewIfExists, dropSchemaIfExists, dropSequenceIfExists,
 
     /**
      * SQL "CREATE SCHEMA" statement is allowed
@@ -650,17 +639,12 @@ public enum Feature {
      */
     pivotXml,
 
-    setOperation,
-    setOperationUnion,
-    setOperationIntersect,
-    setOperationExcept,
-    setOperationMinus,
+    setOperation, setOperationUnion, setOperationIntersect, setOperationExcept, setOperationMinus,
 
     /**
      * "WITH name query"
      */
-    withItem,
-    withItemRecursive,
+    withItem, withItemRecursive,
 
     lateralSubSelect,
     /**
@@ -722,14 +706,11 @@ public enum Feature {
      *
      * @see OracleHierarchicalExpression
      */
-    oracleHierarchicalExpression,
-    oracleOrderBySiblings,
+    oracleHierarchicalExpression, oracleOrderBySiblings,
 
     // MYSQL
 
-    mySqlHintStraightJoin,
-    mysqlSqlCacheFlag,
-    mysqlCalcFoundRows,
+    mySqlHintStraightJoin, mysqlSqlCacheFlag, mysqlCalcFoundRows,
 
     // SQLSERVER
 
@@ -744,32 +725,30 @@ public enum Feature {
     allowSquareBracketQuotation(false),
 
     /**
-     * allow parsing of RDBMS specific syntax by switching off SQL Standard
-     * Compliant Syntax
+     * allow parsing of RDBMS specific syntax by switching off SQL Standard Compliant Syntax
      */
     allowPostgresSpecificSyntax(false),
 
     // PERFORMANCE
 
     /**
-     * allows complex expression parameters or named parameters for functions
-     * will be switched off, when deep nesting of functions is detected
+     * allows complex expression parameters or named parameters for functions will be switched off,
+     * when deep nesting of functions is detected
      */
     allowComplexParsing(true),
 
     /**
-     * allows passing through Unsupported Statements as a plain List of Tokens
-     * needs to be switched off, when VALIDATING statements or parsing blocks
+     * allows passing through Unsupported Statements as a plain List of Tokens needs to be switched
+     * off, when VALIDATING statements or parsing blocks
      */
     allowUnsupportedStatements(false),
 
-    timeOut( 6000),
+    timeOut(6000),
 
     /**
      * allows Backslash '\' as Escape Character
      */
-    allowBackslashEscapeCharacter(false),
-    ;
+    allowBackslashEscapeCharacter(false),;
 
     private final Object value;
     private final boolean configurable;

diff --git a/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java b/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java
@@ -9,13 +9,6 @@
  */
 package net.sf.jsqlparser.statement.insert;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.OracleHint;
 import net.sf.jsqlparser.expression.RowConstructor;
@@ -30,10 +23,16 @@
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectBody;
 import net.sf.jsqlparser.statement.select.SelectItem;
-import net.sf.jsqlparser.statement.select.SetOperationList;
 import net.sf.jsqlparser.statement.select.WithItem;
 import net.sf.jsqlparser.statement.values.ValuesStatement;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+
 @SuppressWarnings({"PMD.CyclomaticComplexity"})
 public class Insert implements Statement {
 
@@ -103,27 +102,19 @@ public void setColumns(List<Column> list) {
     public ItemsList getItemsList() {
         if (select!=null) {
             SelectBody selectBody = select.getSelectBody();
-            if (selectBody instanceof SetOperationList) {
-                SetOperationList setOperationList = (SetOperationList) selectBody;
-                List<SelectBody> selects = setOperationList.getSelects();
-
-                if (selects.size() == 1) {
-                    SelectBody selectBody1 = selects.get(0);
-                    if (selectBody1 instanceof ValuesStatement) {
-                        ValuesStatement valuesStatement = (ValuesStatement) selectBody1;
-                        if (valuesStatement.getExpressions() instanceof ExpressionList) {
-                            ExpressionList expressionList = (ExpressionList) valuesStatement.getExpressions();
-
-                            if (expressionList.getExpressions().size() == 1 && expressionList.getExpressions().get(0) instanceof RowConstructor) {
-                                RowConstructor rowConstructor = (RowConstructor) expressionList.getExpressions().get(0);
-                                return rowConstructor.getExprList();
-                            } else {
-                                return expressionList;
-                            }
-                        } else {
-                            return valuesStatement.getExpressions();
-                        }
+            if (selectBody instanceof ValuesStatement) {
+                ValuesStatement valuesStatement = (ValuesStatement) selectBody;
+                if (valuesStatement.getExpressions() instanceof ExpressionList) {
+                    ExpressionList expressionList = (ExpressionList) valuesStatement.getExpressions();
+
+                    if (expressionList.getExpressions().size() == 1 && expressionList.getExpressions().get(0) instanceof RowConstructor) {
+                        RowConstructor rowConstructor = (RowConstructor) expressionList.getExpressions().get(0);
+                        return rowConstructor.getExprList();
+                    } else {
+                        return expressionList;
                     }
+                } else {
+                    return valuesStatement.getExpressions();
                 }
             }
         }

diff --git a/src/main/java/net/sf/jsqlparser/statement/select/ParenthesedJoin.java b/src/main/java/net/sf/jsqlparser/statement/select/ParenthesedJoin.java
@@ -0,0 +1,23 @@
+package net.sf.jsqlparser.statement.select;
+
+public class ParenthesedJoin extends Join {
+    private Join join;
+
+    public Join getJoin() {
+        return join;
+    }
+
+    public void setJoin(Join join) {
+        this.join = join;
+    }
+
+    public ParenthesedJoin withJoin(Join join) {
+        setJoin(join);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "(" + super.toString() + ")";
+    }
+}
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/ParenthesedSelectBody.java b/src/main/java/net/sf/jsqlparser/statement/select/ParenthesedSelectBody.java
@@ -0,0 +1,27 @@
+package net.sf.jsqlparser.statement.select;
+
+public class ParenthesedSelectBody implements SelectBody {
+    private SelectBody selectBody;
+
+    public SelectBody getSelectBody() {
+        return selectBody;
+    }
+
+    public void setSelectBody(SelectBody selectBody) {
+        this.selectBody = selectBody;
+    }
+
+    public ParenthesedSelectBody withSelectBody(SelectBody selectBody) {
+        setSelectBody(selectBody);
+        return this;
+    }
+
+    @Override
+    public void accept(SelectVisitor selectVisitor) {
+        selectVisitor.visit(this);
+    }
+
+    public String toString() {
+        return "(" + selectBody + ")";
+    }
+}
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/ParenthesisFromItem.java b/src/main/java/net/sf/jsqlparser/statement/select/ParenthesisFromItem.java
@@ -11,11 +11,17 @@
 
 import net.sf.jsqlparser.expression.Alias;
 
-public class ParenthesisFromItem implements FromItem {
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
+public class ParenthesisFromItem implements FromItem {
     private FromItem fromItem;
-
+    private List<Join> joins;
     private Alias alias;
+    private Pivot pivot;
+    private UnPivot unPivot;
 
     public ParenthesisFromItem() {
     }
@@ -32,14 +38,54 @@ public final void setFromItem(FromItem fromItem) {
         this.fromItem = fromItem;
     }
 
+    public List<Join> getJoins() {
+        return joins;
+    }
+
+    public FromItem addJoins(Join... joins) {
+        List<Join> list = Optional.ofNullable(getJoins()).orElseGet(ArrayList::new);
+        Collections.addAll(list, joins);
+        return withJoins(list);
+    }
+
+    public FromItem withJoins(List<Join> joins) {
+        this.setJoins(joins);
+        return this;
+    }
+
+    public void setJoins(List<Join> list) {
+        joins = list;
+    }
+
     @Override
     public void accept(FromItemVisitor fromItemVisitor) {
         fromItemVisitor.visit(this);
     }
 
+    public StringBuilder appendTo(StringBuilder builder) {
+        builder.append("(");
+        builder.append(fromItem);
+        if (joins != null) {
+            for (Join join : joins) {
+                if (join.isSimple()) {
+                    builder.append(", ").append(join);
+                } else {
+                    builder.append(" ").append(join);
+                }
+            }
+        }
+        builder.append(")");
+
+        if (alias!=null) {
+            builder.append(alias);
+        }
+
+        return builder;
+    }
+
     @Override
     public String toString() {
-        return "(" + fromItem + ")" + (alias != null ? alias.toString() : "");
+        return appendTo(new StringBuilder()).toString();
     }
 
     @Override
@@ -54,22 +100,22 @@ public void setAlias(Alias alias) {
 
     @Override
     public Pivot getPivot() {
-        return null;
+        return pivot;
     }
 
     @Override
     public void setPivot(Pivot pivot) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        this.pivot = pivot;
     }
 
     @Override
     public UnPivot getUnPivot() {
-        return null;
+        return unPivot;
     }
 
     @Override
     public void setUnPivot(UnPivot unpivot) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        this.unPivot = unpivot;
     }
 
     public ParenthesisFromItem withFromItem(FromItem fromItem) {