feat: Merge SelectBody into Select Statement

- former `SelectBody` implements `Statement` and so becomes `Select`
- this reduces the AST by 1 hierarchy level

README.md

@@ -19,22 +19,20 @@ SELECT 1 FROM dual WHERE a = b
 
 ```text
  SQL Text
-  └─Statements: net.sf.jsqlparser.statement.select.Select
-     └─selectBody: net.sf.jsqlparser.statement.select.PlainSelect
-        ├─selectItems -> Collection<SelectExpressionItem>
-        │  └─selectItems: net.sf.jsqlparser.statement.select.SelectExpressionItem
-        │     └─LongValue: 1
-        ├─Table: dual
-        └─where: net.sf.jsqlparser.expression.operators.relational.EqualsTo
-           ├─Column: a
-           └─Column: b
+  └─Statements: net.sf.jsqlparser.statement.select.PlainSelect
+      ├─selectItems -> Collection<SelectExpressionItem>
+      │  └─selectItems: net.sf.jsqlparser.statement.select.SelectExpressionItem
+      │     └─LongValue: 1
+      ├─Table: dual
+      └─where: net.sf.jsqlparser.expression.operators.relational.EqualsTo
+         ├─Column: a
+         └─Column: b
 ```
 
 ```java
 Statement statement = CCJSqlParserUtil.parse(sqlStr);
-if (statement instanceof Select) {
-    Select select = (Select) statement;
-    PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+if (statement instanceof PlainSelect) {
+    PlainSelect plainSelect = (PlainSelect) statement;
 
     SelectExpressionItem selectExpressionItem =
             (SelectExpressionItem) plainSelect.getSelectItems().get(0);

src/main/java/net/sf/jsqlparser/expression/AnyComparisonExpression.java

@@ -11,7 +11,7 @@
 
 import net.sf.jsqlparser.expression.operators.relational.ItemsList;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
-import net.sf.jsqlparser.statement.select.ParenthesedSelectBody;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
 
 /**
  * Combines ANY and SOME expressions.
@@ -22,10 +22,10 @@ public class AnyComparisonExpression extends ASTNodeAccessImpl implements Expres
 
     private final ItemsList itemsList;
     private boolean useBracketsForValues = false;
-    private final ParenthesedSelectBody subSelect;
+    private final ParenthesedSelect subSelect;
     private final AnyType anyType;
 
-    public AnyComparisonExpression(AnyType anyType, ParenthesedSelectBody subSelect) {
+    public AnyComparisonExpression(AnyType anyType, ParenthesedSelect subSelect) {
         this.anyType = anyType;
         this.subSelect = subSelect;
         this.itemsList = null;
@@ -37,7 +37,7 @@ public AnyComparisonExpression(AnyType anyType, ItemsList itemsList) {
         this.subSelect = null;
     }
 
-    public ParenthesedSelectBody getSubSelect() {
+    public ParenthesedSelect getSubSelect() {
         return subSelect;
     }
 

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java

@@ -47,8 +47,8 @@
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.AllColumns;
 import net.sf.jsqlparser.statement.select.AllTableColumns;
-import net.sf.jsqlparser.statement.select.ParenthesedSelectBody;
-import net.sf.jsqlparser.statement.select.SelectBody;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
+import net.sf.jsqlparser.statement.select.Select;
 
 public interface ExpressionVisitor {
 
@@ -124,7 +124,7 @@ public interface ExpressionVisitor {
 
     void visit(NotEqualsTo notEqualsTo);
 
-    void visit(ParenthesedSelectBody selectBody);
+    void visit(ParenthesedSelect selectBody);
 
     void visit(Column tableColumn);
 
@@ -226,5 +226,5 @@ public interface ExpressionVisitor {
 
     void visit(GeometryDistance geometryDistance);
 
-    void visit(SelectBody selectBody);
+    void visit(Select selectBody);
 }

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java

@@ -55,11 +55,11 @@
 import net.sf.jsqlparser.statement.select.ExpressionListItem;
 import net.sf.jsqlparser.statement.select.FunctionItem;
 import net.sf.jsqlparser.statement.select.OrderByElement;
-import net.sf.jsqlparser.statement.select.ParenthesedSelectBody;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
 import net.sf.jsqlparser.statement.select.Pivot;
 import net.sf.jsqlparser.statement.select.PivotVisitor;
 import net.sf.jsqlparser.statement.select.PivotXml;
-import net.sf.jsqlparser.statement.select.SelectBody;
+import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectExpressionItem;
 import net.sf.jsqlparser.statement.select.SelectItemVisitor;
 import net.sf.jsqlparser.statement.select.SelectVisitor;
@@ -273,7 +273,7 @@ public void visit(Column column) {
     }
 
     @Override
-    public void visit(ParenthesedSelectBody selectBody) {
+    public void visit(ParenthesedSelect selectBody) {
         if (selectVisitor != null) {
             if (selectBody.getWithItemsList() != null) {
                 for (WithItem item : selectBody.getWithItemsList()) {
@@ -680,7 +680,7 @@ public void visit(GeometryDistance geometryDistance) {
     }
 
     @Override
-    public void visit(SelectBody selectBody) {
+    public void visit(Select selectBody) {
 
     }
 

src/main/java/net/sf/jsqlparser/expression/OracleHint.java

@@ -10,9 +10,9 @@
 package net.sf.jsqlparser.expression;
 
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
-import net.sf.jsqlparser.statement.select.ParenthesedSelectBody;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
 import net.sf.jsqlparser.statement.select.PlainSelect;
-import net.sf.jsqlparser.statement.select.SelectBody;
+import net.sf.jsqlparser.statement.select.Select;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -88,12 +88,12 @@ public OracleHint withSingleLine(boolean singleLine) {
         return this;
     }
 
-    public static OracleHint getHintFromSelectBody(SelectBody selectBody) {
+    public static OracleHint getHintFromSelectBody(Select selectBody) {
 
         if (selectBody instanceof PlainSelect) {
             return ((PlainSelect) selectBody).getOracleHint();
-        } else if (selectBody instanceof ParenthesedSelectBody) {
-            return getHintFromSelectBody(((ParenthesedSelectBody) selectBody).getSelectBody());
+        } else if (selectBody instanceof ParenthesedSelect) {
+            return getHintFromSelectBody(((ParenthesedSelect) selectBody).getSelect());
         } else {
             return null;
         }

src/main/java/net/sf/jsqlparser/expression/operators/relational/ItemsListVisitor.java

@@ -9,11 +9,11 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
-import net.sf.jsqlparser.statement.select.ParenthesedSelectBody;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
 
 public interface ItemsListVisitor {
 
-    void visit(ParenthesedSelectBody selectBody);
+    void visit(ParenthesedSelect selectBody);
 
     void visit(ExpressionList expressionList);
 

src/main/java/net/sf/jsqlparser/expression/operators/relational/ItemsListVisitorAdapter.java

@@ -9,13 +9,13 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
-import net.sf.jsqlparser.statement.select.ParenthesedSelectBody;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
 
 @SuppressWarnings({"PMD.UncommentedEmptyMethodBody"})
 public class ItemsListVisitorAdapter implements ItemsListVisitor {
 
     @Override
-    public void visit(ParenthesedSelectBody subSelect) {
+    public void visit(ParenthesedSelect subSelect) {
 
     }
 

src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java

@@ -31,7 +31,6 @@
 import net.sf.jsqlparser.statement.merge.Merge;
 import net.sf.jsqlparser.statement.replace.Replace;
 import net.sf.jsqlparser.statement.select.Select;
-import net.sf.jsqlparser.statement.select.SelectBody;
 import net.sf.jsqlparser.statement.show.ShowIndexStatement;
 import net.sf.jsqlparser.statement.show.ShowTablesStatement;
 import net.sf.jsqlparser.statement.truncate.Truncate;
@@ -127,6 +126,4 @@ public interface StatementVisitor {
     void visit(AlterSystemStatement alterSystemStatement);
 
     void visit(UnsupportedStatement unsupportedStatement);
-
-    void visit(SelectBody selectBody);
 }

src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java

@@ -31,7 +31,6 @@
 import net.sf.jsqlparser.statement.merge.Merge;
 import net.sf.jsqlparser.statement.replace.Replace;
 import net.sf.jsqlparser.statement.select.Select;
-import net.sf.jsqlparser.statement.select.SelectBody;
 import net.sf.jsqlparser.statement.show.ShowIndexStatement;
 import net.sf.jsqlparser.statement.show.ShowTablesStatement;
 import net.sf.jsqlparser.statement.truncate.Truncate;
@@ -229,9 +228,4 @@ public void visit(AlterSystemStatement alterSystemStatement) {}
     public void visit(UnsupportedStatement unsupportedStatement) {
 
     }
-
-    @Override
-    public void visit(SelectBody selectBody) {
-
-    }
 }

src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java

@@ -9,21 +9,22 @@
  */
 package net.sf.jsqlparser.statement.create.view;
 
+import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.StatementVisitor;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.Statement;
-import net.sf.jsqlparser.statement.StatementVisitor;
-import net.sf.jsqlparser.statement.select.PlainSelect;
-import net.sf.jsqlparser.statement.select.SelectBody;
 
 public class AlterView implements Statement {
 
     private Table view;
-    private SelectBody selectBody;
+    private Select select;
     private boolean useReplace = false;
     private List<String> columnNames = null;
 
@@ -40,12 +41,12 @@ public void setView(Table view) {
         this.view = view;
     }
 
-    public SelectBody getSelectBody() {
-        return selectBody;
+    public Select getSelect() {
+        return select;
     }
 
-    public void setSelectBody(SelectBody selectBody) {
-        this.selectBody = selectBody;
+    public void setSelect(Select select) {
+        this.select = select;
     }
 
     public List<String> getColumnNames() {
@@ -77,7 +78,7 @@ public String toString() {
         if (columnNames != null) {
             sql.append(PlainSelect.getStringList(columnNames, true, true));
         }
-        sql.append(" AS ").append(selectBody);
+        sql.append(" AS ").append(select);
         return sql.toString();
     }
 
@@ -86,8 +87,8 @@ public AlterView withView(Table view) {
         return this;
     }
 
-    public AlterView withSelectBody(SelectBody selectBody) {
-        this.setSelectBody(selectBody);
+    public AlterView withSelect(Select select) {
+        this.setSelect(select);
         return this;
     }
 
@@ -113,7 +114,7 @@ public AlterView addColumnNames(Collection<String> columnNames) {
         return this.withColumnNames(collection);
     }
 
-    public <E extends SelectBody> E getSelectBody(Class<E> type) {
-        return type.cast(getSelectBody());
+    public <E extends Select> E getSelectBody(Class<E> type) {
+        return type.cast(getSelect());
     }
 }

src/main/java/net/sf/jsqlparser/statement/insert/Insert.java

@@ -21,7 +21,6 @@
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 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.WithItem;
 import net.sf.jsqlparser.statement.select.Values;
@@ -101,25 +100,22 @@ public void setColumns(List<Column> list) {
      */
     @Deprecated
     public ItemsList getItemsList() {
-        if (select != null) {
-            SelectBody selectBody = select.getSelectBody();
-            if (selectBody instanceof Values) {
-                Values valuesStatement = (Values) 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;
-                    }
+        if (select instanceof Values) {
+            Values valuesStatement = (Values) select;
+            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 valuesStatement.getExpressions();
+                    return expressionList;
                 }
+            } else {
+                return valuesStatement.getExpressions();
             }
         }
         return null;
@@ -128,7 +124,7 @@ public ItemsList getItemsList() {
 
     @Deprecated
     public boolean isUseValues() {
-        return select != null && select.getSelectBody() instanceof Values;
+        return select != null && select instanceof Values;
     }
 
     public List<SelectItem> getReturningExpressionList() {

src/main/java/net/sf/jsqlparser/statement/merge/Merge.java

@@ -16,7 +16,7 @@
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.FromItem;
-import net.sf.jsqlparser.statement.select.ParenthesedSelectBody;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
 import net.sf.jsqlparser.statement.select.WithItem;
 
 import java.util.ArrayList;
@@ -91,7 +91,7 @@ public void setUsingTable(Table usingTable) {
     }
 
     @Deprecated
-    public void setUsingSelect(ParenthesedSelectBody usingSelect) {
+    public void setUsingSelect(ParenthesedSelect usingSelect) {
         this.fromItem = usingSelect;
     }
 
@@ -200,7 +200,7 @@ public Merge withUsingTable(Table usingTable) {
     }
 
     @Deprecated
-    public Merge withUsingSelect(ParenthesedSelectBody usingSelect) {
+    public Merge withUsingSelect(ParenthesedSelect usingSelect) {
         this.setUsingSelect(usingSelect);
         return this;
     }

src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java

@@ -15,7 +15,7 @@ public interface FromItemVisitor {
 
     void visit(Table tableName);
 
-    void visit(ParenthesedSelectBody selectBody);
+    void visit(ParenthesedSelect selectBody);
 
     void visit(LateralSubSelect lateralSubSelect);
 

src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java

@@ -20,7 +20,7 @@ public void visit(Table table) {
     }
 
     @Override
-    public void visit(ParenthesedSelectBody selectBody) {
+    public void visit(ParenthesedSelect selectBody) {
 
     }