fix: ExpressionList of Expressions in Values

Author: manticore-projects

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

@@ -18,22 +18,22 @@
 
 public class Values extends Select {
 
-    private ExpressionList expressions;
+    private ExpressionList<Expression> expressions;
 
     public Values() {
         // empty constructor
     }
 
-    public Values(ExpressionList expressions) {
+    public Values(ExpressionList<Expression> expressions) {
         this.expressions = expressions;
     }
 
-    public ExpressionList getExpressions() {
+    public ExpressionList<?> getExpressions() {
         return expressions;
     }
 
 
-    public void setExpressions(ExpressionList expressions) {
+    public void setExpressions(ExpressionList<Expression> expressions) {
         this.expressions = expressions;
     }
 
@@ -49,7 +49,7 @@ public void accept(SelectVisitor selectVisitor) {
         selectVisitor.visit(this);
     }
 
-    public Values withExpressions(ExpressionList expressions) {
+    public Values withExpressions(ExpressionList<Expression> expressions) {
         this.setExpressions(expressions);
         return this;
     }
@@ -60,7 +60,7 @@ public Values addExpressions(Expression... expressions) {
 
     public Values addExpressions(Collection<? extends Expression> expressions) {
         if (this.expressions == null) {
-            this.expressions = new ParenthesedExpressionList();
+            this.expressions = new ParenthesedExpressionList<>();
         }
         this.expressions.addAll(expressions);
         return this;

src/test/java/net/sf/jsqlparser/statement/insert/InsertTest.java

@@ -203,11 +203,11 @@ public void testInsertMultiRowValue() throws JSQLParserException {
         String statement = "INSERT INTO mytable (col1, col2) VALUES (a, b), (d, e)";
         assertSqlCanBeParsedAndDeparsed(statement);
 
-        ExpressionList<Column> multiExpressionList = new ExpressionList<>()
+        ExpressionList<Expression> multiExpressionList = new ExpressionList<>()
                 .addExpression(
-                        new ParenthesedExpressionList<Column>(new Column("a"), new Column("b")))
+                        new ParenthesedExpressionList<Expression>(new Column("a"), new Column("b")))
                 .addExpression(
-                        new ParenthesedExpressionList<Column>(new Column("d"), new Column("e")));
+                        new ParenthesedExpressionList<Expression>(new Column("d"), new Column("e")));
 
         Select select = new Values().withExpressions(multiExpressionList);