started multivalue set

Author: wumpz

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

@@ -39,55 +39,84 @@
  */
 package net.sf.jsqlparser.statement;
 
+import java.util.ArrayList;
+import java.util.List;
 import net.sf.jsqlparser.expression.Expression;
 
 /**
  *
  * @author toben
  */
-public class SetStatement implements Statement {
+public final class SetStatement implements Statement {
 
-    private String name;
-    private Expression expression;
-    private boolean useEqual;
+    private final List<NameExpr> values = new ArrayList<>();
 
     public SetStatement(String name, Expression expression) {
-        this.name = name;
-        this.expression = expression;
+        add(name, expression, true);
+    }
+
+    public void add(String name, Expression expression, boolean useEqual) {
+        values.add(new NameExpr(name, expression, useEqual));
     }
 
     public boolean isUseEqual() {
-        return useEqual;
+        return values.get(0).useEqual;
     }
 
     public SetStatement setUseEqual(boolean useEqual) {
-        this.useEqual = useEqual;
+        values.get(0).useEqual = useEqual;
         return this;
     }
 
     public String getName() {
-        return name;
+        return values.get(0).name;
     }
 
     public void setName(String name) {
-        this.name = name;
+        values.get(0).name = name;
     }
 
     public Expression getExpression() {
-        return expression;
+        return values.get(0).expression;
     }
 
     public void setExpression(Expression expression) {
-        this.expression = expression;
+        values.get(0).expression = expression;
+    }
+
+    private String toString(NameExpr ne) {
+        return "SET " + ne.name + (ne.useEqual ? " = " : " ") + ne.expression.toString();
     }
 
     @Override
     public String toString() {
-        return "SET " + name + (useEqual ? " = " : " ") + expression.toString();
+        StringBuilder b = new StringBuilder("SET ");
+
+        for (NameExpr ne : values) {
+            if (b.length() != 4) {
+                b.append(", ");
+            }
+            b.append(toString(ne));
+        }
+
+        return b.toString();
     }
 
     @Override
     public void accept(StatementVisitor statementVisitor) {
         statementVisitor.visit(this);
     }
+
+    static class NameExpr {
+
+        private String name;
+        private Expression expression;
+        private boolean useEqual;
+
+        public NameExpr(String name, Expression expr, boolean useEqual) {
+            this.name = name;
+            this.expression = expr;
+            this.useEqual = useEqual;
+        }
+    }
 }

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -521,12 +521,15 @@ SetStatement Set(): {
     String name;
     Expression value;
     boolean useEqual = false;
+    SetStatement set;
 }
 {
     <K_SET> name = RelObjectNameExt() ["=" { useEqual=true; } ] value=SimpleExpression()
-    {
-        return new SetStatement(name,value).setUseEqual(useEqual);
-    }
+    { set = new SetStatement(name,value).setUseEqual(useEqual); }
+    ( { useEqual=false; } "," name = RelObjectNameExt() ["=" { useEqual=true; } ] value=SimpleExpression()
+        { set.add(name, value, useEqual); } )*
+
+    { return set; }
 }
 
 DescribeStatement Describe(): {

src/test/java/net/sf/jsqlparser/statement/SetStatementTest.java

@@ -20,10 +20,6 @@
 
 import net.sf.jsqlparser.JSQLParserException;
 import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -32,25 +28,6 @@
  */
 public class SetStatementTest {
 
-    public SetStatementTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
     @Test
     public void testSimpleSet() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SET statement_timeout = 0");
@@ -65,4 +42,9 @@ public void testIssue373() throws JSQLParserException {
     public void testIssue373_2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SET tester 5");
     }
+
+    @Test
+    public void testMultiValue() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SET v=1, c=3");
+    }
 }