replace support multiple values

JSQLParser · Aug 21, 2017 · 93598bb · 93598bb
1 parent 147ec48
commit 93598bb
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java
@@ -148,6 +148,20 @@ public void setSelectVisitor(SelectVisitor visitor) {
 
     @Override
     public void visit(MultiExpressionList multiExprList) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        buffer.append("VALUES ");
+        for (Iterator<ExpressionList> it = multiExprList.getExprList().iterator(); it.hasNext();) {
+            buffer.append("(");
+            for (Iterator<Expression> iter = it.next().getExpressions().iterator(); iter.hasNext();) {
+                Expression expression = iter.next();
+                expression.accept(expressionVisitor);
+                if (iter.hasNext()) {
+                    buffer.append(", ");
+                }
+            }
+            buffer.append(")");
+            if (it.hasNext()) {
+                buffer.append(", ");
+            }
+        }
     }
 }
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -528,6 +528,7 @@ Replace Replace():
 
     List<Column> columns = new ArrayList<Column>();
     List<Expression> expList = new ArrayList<Expression>();
+    MultiExpressionList multiExpr = null;
     ItemsList itemsList = null;
     Expression exp = null;
 }
@@ -549,6 +550,15 @@ Replace Replace():
             (
                 LOOKAHEAD(2) [<K_VALUES> | <K_VALUE>] "(" exp=PrimaryExpression() { expList.add(exp); }
                         ("," exp=PrimaryExpression()  { expList.add(exp); } )* ")" { itemsList = new ExpressionList(expList); }
+                        ("," "(" exp=SimpleExpression() {
+                            if (multiExpr==null) {
+                                multiExpr=new MultiExpressionList();
+                                multiExpr.addExpressionList((ExpressionList)itemsList);
+                                itemsList = multiExpr;
+                            }
+                            expList = new ArrayList<Expression>();
+                            expList.add(exp); }
+                            ("," exp=SimpleExpression() { expList.add(exp); } )* ")" { multiExpr.addExpressionList(expList); } )*
                 |
                     { replace.setUseValues(false); }
                     itemsList=SubSelect()

diff --git a/src/test/java/net/sf/jsqlparser/test/replace/ReplaceTest.java b/src/test/java/net/sf/jsqlparser/test/replace/ReplaceTest.java
@@ -76,4 +76,11 @@ public void testProblemMissingIntoIssue389() throws JSQLParserException {
         TestUtils.
                 assertSqlCanBeParsedAndDeparsed("REPLACE INTO mytable (key, data) VALUES (1, \"aaa\")");
     }
+
+
+    @Test
+    public void testMultipleValues() throws JSQLParserException {
+        TestUtils.
+                assertSqlCanBeParsedAndDeparsed("REPLACE INTO mytable (col1, col2, col3) VALUES (1, \"aaa\", now()), (2, \"bbb\", now())");
+    }
 }