feat: Consolidate the ExpressionList, removing many redundant List …

…alike Classes and Productions - `ExpressionList` extends a `List<Expression>` directly and implements `Expression` - `ExpressionList` has no Brackets - introduce `ParenthesedExpressionList` which extends `ExpressionList` and has Brackets - refactor `MultiExpressionList` to extend `List<ExpressionList>` - replace any occurrence of `List<Expression>` with `ExpressionList` and remove lots of redundant Productions - `RowConstructor` extends `ExpressionList` - remove redundant `ValueExpressionList` (it was just an `ExpressionList` - get rid of any `useBrackets` flags - consolidate the `Cast` Functions - use `ExpressionListDeparser` as much as possible BREAKING-CHANGE: All `List<Expression>` and `List<Column>` related methods have changed. No `useBrackets` flags, instead use `ParenthesedExpressionList` when brackets are needed.
JSQLParser · manticore-projects · Jun 15, 2023 · Dec 11, 2022 · Dec 22, 2022 · Jan 8, 2023
commit 288b177fe9c8a4c0469e8e30c0901a949d0a826a
diff --git a/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java b/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java
@@ -9,16 +9,19 @@
  */
 package net.sf.jsqlparser.expression;
 
-import java.util.List;
-import static java.util.stream.Collectors.joining;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.select.OrderByElement;
 
+import java.util.List;
+
+import static java.util.stream.Collectors.joining;
+
 /**
- * Analytic function. The name of the function is variable but the parameters following the special analytic function
- * path. e.g. row_number() over (order by test). Additional there can be an expression for an analytical aggregate like
- * sum(col) or the "all collumns" wildcard like count(*).
+ * Analytic function. The name of the function is variable but the parameters following the special
+ * analytic function path. e.g. row_number() over (order by test). Additional there can be an
+ * expression for an analytical aggregate like sum(col) or the "all collumns" wildcard like
+ * count(*).
  *
  * @author tw
  */
@@ -33,15 +36,15 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private AnalyticType type = AnalyticType.OVER;
     private boolean distinct = false;
     private boolean unique = false;
-    private boolean ignoreNulls = false;            //IGNORE NULLS inside function parameters
-    private boolean ignoreNullsOutside = false;     //IGNORE NULLS outside function parameters
+    private boolean ignoreNulls = false; // IGNORE NULLS inside function parameters
+    private boolean ignoreNullsOutside = false; // IGNORE NULLS outside function parameters
     private Expression filterExpression = null;
     private List<OrderByElement> funcOrderBy = null;
-    private String windowName = null;               // refers to an external window definition (paritionBy, orderBy, windowElement)
+    private String windowName = null; // refers to an external window definition (paritionBy,
+                                      // orderBy, windowElement)
     private WindowDefinition windowDef = new WindowDefinition();
 
-    public AnalyticExpression() {
-    }
+    public AnalyticExpression() {}
 
     public AnalyticExpression(Function function) {
         name = function.getName();
@@ -50,18 +53,19 @@ public AnalyticExpression(Function function) {
         unique = function.isUnique();
         funcOrderBy = function.getOrderByElements();
 
-        ExpressionList list = function.getParameters();
+        ExpressionList<Expression> list = function.getParameters();
         if (list != null) {
             if (list.getExpressions().size() > 3) {
-                throw new IllegalArgumentException("function object not valid to initialize analytic expression");
+                throw new IllegalArgumentException(
+                        "function object not valid to initialize analytic expression");
             }
 
-            expression = list.getExpressions().get(0);
+            expression = list.get(0);
             if (list.getExpressions().size() > 1) {
-                offset = list.getExpressions().get(1);
+                offset = list.get(1);
             }
             if (list.getExpressions().size() > 2) {
-                defaultValue = list.getExpressions().get(2);
+                defaultValue = list.get(2);
             }
         }
         ignoreNulls = function.isIgnoreNulls();
@@ -97,7 +101,8 @@ public void setPartitionExpressionList(ExpressionList partitionExpressionList) {
         setPartitionExpressionList(partitionExpressionList, false);
     }
 
-    public void setPartitionExpressionList(ExpressionList partitionExpressionList, boolean brackets) {
+    public void setPartitionExpressionList(ExpressionList partitionExpressionList,
+            boolean brackets) {
         windowDef.partitionBy.setPartitionExpressionList(partitionExpressionList, brackets);
     }
 
@@ -202,7 +207,8 @@ public void setWindowDefinition(WindowDefinition windowDef) {
     }
 
     @Override
-    @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity", "PMD.MissingBreakInSwitch"})
+    @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity",
+            "PMD.MissingBreakInSwitch"})
     public String toString() {
         StringBuilder b = new StringBuilder();
 
@@ -266,7 +272,7 @@ public String toString() {
 
         if (windowName != null) {
             b.append(" ").append(windowName);
-        } else if (type!=AnalyticType.WITHIN_GROUP_OVER)  {
+        } else if (type != AnalyticType.WITHIN_GROUP_OVER) {
             b.append(" ");
             b.append(windowDef.toString());
         }

diff --git a/src/main/java/net/sf/jsqlparser/expression/CastExpression.java b/src/main/java/net/sf/jsqlparser/expression/CastExpression.java
@@ -11,35 +11,41 @@
 
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
+import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
+import net.sf.jsqlparser.statement.select.Select;
+
+import java.util.ArrayList;
 
 public class CastExpression extends ASTNodeAccessImpl implements Expression {
+    public String keyword;
 
     private Expression leftExpression;
-    private ColDataType type;
-    private RowConstructor rowConstructor;
+    private ColDataType colDataType = null;
+    private ArrayList<ColumnDefinition> columnDefinitions = new ArrayList<>();
     private boolean useCastKeyword = true;
-
-    public RowConstructor getRowConstructor() {
-        return rowConstructor;
-    }
-
-    public void setRowConstructor(RowConstructor rowConstructor) {
-        this.rowConstructor = rowConstructor;
-        this.type = null;
-    }
-
-    public CastExpression withRowConstructor(RowConstructor rowConstructor) {
-        setRowConstructor(rowConstructor);
-        return this;
+
+    public CastExpression(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public CastExpression() {
+        this("CAST");
+    }
+
+    public ColDataType getColDataType() {
+        return colDataType;
+    }
+
+    public ArrayList<ColumnDefinition> getColumnDefinitions() {
+        return columnDefinitions;
     }
 
-    public ColDataType getType() {
-        return type;
+    public void setColDataType(ColDataType colDataType) {
+        this.colDataType = colDataType;
     }
 
-    public void setType(ColDataType type) {
-        this.type = type;
-        this.rowConstructor = null;
+    public void addColumnDefinition(ColumnDefinition columnDefinition) {
+        this.columnDefinitions.add(columnDefinition);
     }
 
     public Expression getLeftExpression() {
@@ -66,16 +72,17 @@ public void setUseCastKeyword(boolean useCastKeyword) {
     @Override
     public String toString() {
         if (useCastKeyword) {
-            return rowConstructor!=null
-              ? "CAST(" + leftExpression + " AS " + rowConstructor.toString() + ")"
-              : "CAST(" + leftExpression + " AS " + type.toString() + ")";
+            return columnDefinitions.size() > 1
+                    ? keyword + "(" + leftExpression + " AS ROW("
+                            + Select.getStringList(columnDefinitions) + "))"
+                    : keyword + "(" + leftExpression + " AS " + colDataType.toString() + ")";
         } else {
-            return leftExpression + "::" + type.toString();
+            return leftExpression + "::" + colDataType.toString();
         }
     }
 
     public CastExpression withType(ColDataType type) {
-        this.setType(type);
+        this.setColDataType(type);
         return this;
     }
 

diff --git a/src/main/java/net/sf/jsqlparser/expression/DateTimeLiteralExpression.java b/src/main/java/net/sf/jsqlparser/expression/DateTimeLiteralExpression.java
@@ -53,10 +53,7 @@ public DateTimeLiteralExpression withType(DateTime type) {
     }
 
     public enum DateTime {
-        DATE("DATE")
-        , TIME("TIME")
-        , TIMESTAMP("TIMESTAMP")
-        , TIMESTAMPTZ("TIMESTAMPTZ");
+        DATE("DATE"), TIME("TIME"), TIMESTAMP("TIMESTAMP"), TIMESTAMPTZ("TIMESTAMPTZ");
 
         public String getDateTime() {
             return dateTime;
@@ -68,7 +65,7 @@ public String getDateTime() {
             this.dateTime = dateTime;
         }
 
-        private final DateTime from(String dateTimeStr) {
+        public static DateTime from(String dateTimeStr) {
             return Enum.valueOf(DateTime.class, dateTimeStr.toUpperCase());
         }
     }

diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java
@@ -27,6 +27,7 @@
 import net.sf.jsqlparser.expression.operators.relational.Between;
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.FullTextSearch;
 import net.sf.jsqlparser.expression.operators.relational.GeometryDistance;
 import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
@@ -148,10 +149,6 @@ public interface ExpressionVisitor {
 
     void visit(CastExpression cast);
 
-    void visit(TryCastExpression cast);
-
-    void visit(SafeCastExpression cast);
-
     void visit(Modulo modulo);
 
     void visit(AnalyticExpression aexpr);
@@ -178,9 +175,9 @@ public interface ExpressionVisitor {
 
     void visit(MySQLGroupConcat groupConcat);
 
-    void visit(ValueListExpression valueList);
+    void visit(ExpressionList<?> expressionList);
 
-    void visit(RowConstructor rowConstructor);
+    void visit(RowConstructor<?> rowConstructor);
 
     void visit(RowGetExpression rowGetExpression);
 

diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java
@@ -49,7 +49,6 @@
 import net.sf.jsqlparser.expression.operators.relational.RegExpMySQLOperator;
 import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
 import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
 import net.sf.jsqlparser.statement.select.AllColumns;
 import net.sf.jsqlparser.statement.select.AllTableColumns;
 import net.sf.jsqlparser.statement.select.ExpressionListItem;
@@ -88,7 +87,7 @@ public void visit(NullValue value) {
     @Override
     public void visit(Function function) {
         if (function.getParameters() != null) {
-            function.getParameters().accept(this);
+            function.getParameters().accept((ItemsListVisitor) this);
         }
         if (function.getKeep() != null) {
             function.getKeep().accept(this);
@@ -198,8 +197,8 @@ public void visit(Between expr) {
     }
 
     public void visit(OverlapsCondition overlapsCondition) {
-        overlapsCondition.getLeft().accept(this);
-        overlapsCondition.getRight().accept(this);
+        overlapsCondition.getLeft().accept((ItemsListVisitor) this);
+        overlapsCondition.getRight().accept((ItemsListVisitor) this);
     }
 
 
@@ -346,16 +345,6 @@ public void visit(CastExpression expr) {
         expr.getLeftExpression().accept(this);
     }
 
-    @Override
-    public void visit(TryCastExpression expr) {
-        expr.getLeftExpression().accept(this);
-    }
-
-    @Override
-    public void visit(SafeCastExpression expr) {
-        expr.getLeftExpression().accept(this);
-    }
-
     @Override
     public void visit(Modulo expr) {
         visitBinaryExpression(expr);
@@ -406,8 +395,15 @@ public void visit(RegExpMatchOperator expr) {
     }
 
     @Override
-    public void visit(ExpressionList expressionList) {
-        for (Expression expr : expressionList.getExpressions()) {
+    public void visit(ExpressionList<?> expressionList) {
+        for (Expression expr : expressionList) {
+            expr.accept(this);
+        }
+    }
+
+    @Override
+    public void visit(RowConstructor<?> rowConstructor) {
+        for (Expression expr : rowConstructor) {
             expr.accept(this);
         }
     }
@@ -420,8 +416,8 @@ public void visit(NamedExpressionList namedExpressionList) {
     }
 
     @Override
-    public void visit(MultiExpressionList multiExprList) {
-        for (ExpressionList list : multiExprList.getExprList()) {
+    public void visit(MultiExpressionList<?> multiExprList) {
+        for (ExpressionList<?> list : multiExprList.getExprList()) {
             visit(list);
         }
     }
@@ -490,13 +486,6 @@ public void visit(MySQLGroupConcat groupConcat) {
         }
     }
 
-    @Override
-    public void visit(ValueListExpression valueListExpression) {
-        for (Expression expr : valueListExpression.getExpressionList().getExpressions()) {
-            expr.accept(this);
-        }
-    }
-
     @Override
     public void visit(Pivot pivot) {
         for (FunctionItem item : pivot.getFunctionItems()) {
@@ -513,7 +502,7 @@ public void visit(Pivot pivot) {
 
         if (pivot.getMultiInItems() != null) {
             for (ExpressionListItem item : pivot.getMultiInItems()) {
-                item.getExpressionList().accept(this);
+                item.getExpressionList().accept((ItemsListVisitor) this);
             }
         }
     }
@@ -555,19 +544,6 @@ public void visit(SelectItem selectExpressionItem) {
         selectExpressionItem.getExpression().accept(this);
     }
 
-    @Override
-    public void visit(RowConstructor rowConstructor) {
-        if (rowConstructor.getColumnDefinitions().isEmpty()) {
-            for (Expression expression : rowConstructor.getExprList().getExpressions()) {
-                expression.accept(this);
-            }
-        } else {
-            for (ColumnDefinition columnDefinition : rowConstructor.getColumnDefinitions()) {
-                columnDefinition.accept(this);
-            }
-        }
-    }
-
     @Override
     public void visit(RowGetExpression rowGetExpression) {
         rowGetExpression.getExpression().accept(this);
@@ -693,8 +669,4 @@ public void visit(TranscodingFunction transcodingFunction) {
     public void visit(TrimFunction trimFunction) {
 
     }
-
-    public void visit(ColumnDefinition columnDefinition) {
-        columnDefinition.accept(this);
-    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/expression/Function.java b/src/main/java/net/sf/jsqlparser/expression/Function.java
@@ -14,7 +14,6 @@
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.OrderByElement;
-import net.sf.jsqlparser.statement.select.PlainSelect;
 
 import java.util.Arrays;
 import java.util.List;
@@ -206,7 +205,7 @@ public String toString() {
                 if (isAllColumns()) {
                     b.append("ALL ");
                 }
-                b.append(PlainSelect.getStringList(parameters.getExpressions(), true, false));
+                b.append(parameters);
                 if (orderByElements != null) {
                     b.append(" ORDER BY ");
                     boolean comma = false;
@@ -274,9 +273,7 @@ public Function withParameters(ExpressionList parameters) {
     }
 
     public Function withParameters(Expression... parameters) {
-        ExpressionList expressionList = new ExpressionList(parameters).withUsingBrackets(false);
-        this.setParameters(expressionList);
-        return this;
+        return withParameters(new ExpressionList(parameters));
     }
 
     public Function withNamedParameters(NamedExpressionList namedParameters) {