Author: wumpz

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

@@ -34,7 +34,7 @@ public ExpressionList(List<Expression> expressions) {
     }
 
     public ExpressionList(Expression... expressions) {
-        this.expressions = Arrays.asList(expressions);
+        this.expressions = new ArrayList<>(Arrays.asList(expressions));
     }
 
     public List<Expression> getExpressions() {
@@ -55,7 +55,7 @@ public ExpressionList withExpressions(List<Expression> expressions) {
     public void setExpressions(List<Expression> expressions) {
         this.expressions = expressions;
     }
-    
+
     public ExpressionList withBrackets(boolean brackets) {
         this.withBrackets = brackets;
         return this;

src/main/java/net/sf/jsqlparser/statement/values/ValuesStatement.java

@@ -62,11 +62,21 @@ public ValuesStatement withExpressions(ItemsList expressions) {
         return this;
     }
 
-    public ValuesStatement addExpressions(Expression... expressions) {
-        return this.withExpressions(new ExpressionList(expressions));
+    public ValuesStatement addExpressions(Expression... addExpressions) {
+        if (expressions != null && expressions instanceof ExpressionList) {
+            ((ExpressionList) expressions).addExpressions(addExpressions);
+            return this;
+        } else {
+            return this.withExpressions(new ExpressionList(addExpressions));
+        }
     }
 
-    public ValuesStatement addExpressions(Collection<? extends Expression> expressions) {
-        return this.withExpressions(new ExpressionList(new ArrayList<>(expressions)));
+    public ValuesStatement addExpressions(Collection<? extends Expression> addExpressions) {
+        if (expressions != null && expressions instanceof ExpressionList) {
+            ((ExpressionList) expressions).addExpressions(addExpressions);
+            return this;
+        } else {
+            return this.withExpressions(new ExpressionList(new ArrayList<>(addExpressions)));
+        }
     }
 }

src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java

@@ -244,7 +244,7 @@ public void testAllSqlsParseDeparse() throws IOException {
 
         LOG.
                 log(Level.INFO, "tested {0} files. got {1} correct parse results", new Object[]{count, success});
-        assertTrue(success >= 166);
+        assertTrue(success >= 176);
     }
 
     @Test

src/test/java/net/sf/jsqlparser/statement/values/ValuesTest.java

@@ -11,7 +11,9 @@
 
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.LongValue;
+import net.sf.jsqlparser.expression.RowConstructor;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SetOperationList;
@@ -26,9 +28,16 @@ public class ValuesTest {
     public void testDuplicateKey() throws JSQLParserException {
         String statement = "VALUES (1, 2, 'test')";
         Statement parsed = assertSqlCanBeParsedAndDeparsed(statement);
+
+        ExpressionList list = new ExpressionList(new LongValue(1))
+                .addExpressions(asList(new LongValue(2), new StringValue("test"))).withBrackets(true);
+
         Select created = new Select().withSelectBody(new SetOperationList()
-                .addBrackets(Boolean.FALSE).addSelects(new ValuesStatement().addExpressions(new LongValue(1))
-                        .addExpressions(asList(new LongValue(2), new StringValue("test")))));
+                .addBrackets(Boolean.FALSE).addSelects(
+                new ValuesStatement().withExpressions(
+                        new ExpressionList(
+                                new RowConstructor().withExprList(list))
+                                .withBrackets(false))));
 
         assertDeparse(created, statement);
         assertEqualsObjectTree(parsed, created);