Merge pull request #192 from packageOk/master

support on duplicate key update and update replaceDeParser

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/insert/Insert.java

@@ -23,6 +23,7 @@
 
 import java.util.List;
 
+import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ItemsList;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
@@ -44,6 +45,9 @@ public class Insert implements Statement {
     private boolean useValues = true;
     private Select select;
     private boolean useSelectBrackets = true;
+    private boolean useDuplicate = false;
+    private List<Column> duplicateUpdateColumns;
+    private List<Expression> duplicateUpdateExpressionList;
 
     private boolean returningAllColumns = false;
 
@@ -128,6 +132,30 @@ public void setUseSelectBrackets(boolean useSelectBrackets) {
         this.useSelectBrackets = useSelectBrackets;
     }
 
+    public boolean isUseDuplicate() {
+        return useDuplicate;
+    }
+
+    public void setUseDuplicate(boolean useDuplicate) {
+        this.useDuplicate = useDuplicate;
+    }
+
+    public List<Column> getDuplicateUpdateColumns() {
+        return duplicateUpdateColumns;
+    }
+
+    public void setDuplicateUpdateColumns(List<Column> duplicateUpdateColumns) {
+        this.duplicateUpdateColumns = duplicateUpdateColumns;
+    }
+
+    public List<Expression> getDuplicateUpdateExpressionList() {
+        return duplicateUpdateExpressionList;
+    }
+
+    public void setDuplicateUpdateExpressionList(List<Expression> duplicateUpdateExpressionList) {
+        this.duplicateUpdateExpressionList = duplicateUpdateExpressionList;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder();
@@ -156,6 +184,17 @@ public String toString() {
             sql.append(")");
         }
 
+        if (useDuplicate){
+            sql.append(" ON DUPLICATE KEY UPDATE ");
+            for (int i = 0; i < getDuplicateUpdateColumns().size(); i++) {
+                if (i != 0) {
+                    sql.append(", ");
+                }
+                sql.append(duplicateUpdateColumns.get(i)).append(" = ");
+                sql.append(duplicateUpdateExpressionList.get(i));
+            }
+        }
+
         if (isReturningAllColumns()) {
             sql.append(" RETURNING *");
         } else if (getReturningExpressionList() != null) {

src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java

@@ -110,6 +110,20 @@ public void deParse(Insert insert) {
             }
         }
 
+        if(insert.isUseDuplicate()){
+            buffer.append(" ON DUPLICATE KEY UPDATE ");
+            for (int i = 0; i < insert.getDuplicateUpdateColumns().size(); i++) {
+                Column column = insert.getDuplicateUpdateColumns().get(i);
+                buffer.append(column.getFullyQualifiedName()).append(" = ");
+
+                Expression expression = insert.getDuplicateUpdateExpressionList().get(i);
+                expression.accept(expressionVisitor);
+                if (i < insert.getDuplicateUpdateColumns().size() - 1) {
+                    buffer.append(", ");
+                }
+            }
+        }
+
         if (insert.isReturningAllColumns()) {
             buffer.append(" RETURNING *");
         } else if (insert.getReturningExpressionList() != null) {

src/main/java/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java

@@ -106,11 +106,12 @@ public void deParse(Replace replace) {
 			// REPLACE mytab SELECT * FROM mytab2
 			// or VALUES ('as', ?, 565)
 
-			if (replace.isUseValues()) {
-				buffer.append(" VALUES");
-			}
-
-			buffer.append(replace.getItemsList());
+//			if (replace.isUseValues()) {
+//				buffer.append(" VALUES");
+//			}
+//
+//			buffer.append(replace.getItemsList());
+			replace.getItemsList().accept(this);
 		}
 	}
 

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

@@ -458,6 +458,9 @@ Insert Insert():
     List<SelectExpressionItem> returning = null;
     Select select = null;
     boolean useSelectBrackets = false;
+    boolean useDuplicate = false;
+    List<Column> duplicateUpdateColumns = null;
+    List<Expression> duplicateUpdateExpressionList = null;
 }
 {
     <K_INSERT> [<K_INTO>] table=Table()
@@ -490,6 +493,20 @@ Insert Insert():
         )
 	)
 
+	[ "ON DUPLICATE KEY UPDATE"
+	    { useDuplicate = true;}
+	  tableColumn=Column() "=" exp=SimpleExpression()
+	    {
+	        duplicateUpdateColumns = new ArrayList<Column>();
+	        duplicateUpdateExpressionList = new ArrayList<Expression>();
+	        duplicateUpdateColumns.add(tableColumn);
+	        duplicateUpdateExpressionList.add(exp);
+	    }
+      ("," tableColumn=Column() "=" exp=SimpleExpression()
+        { duplicateUpdateColumns.add(tableColumn);
+        duplicateUpdateExpressionList.add(exp); } )*]
+
+
     [ <K_RETURNING> (
            "*" { insert.setReturningAllColumns(true); }
            | returning=ListExpressionItem()
@@ -503,6 +520,9 @@ Insert Insert():
 	    insert.setTable(table);
 	    if (columns.size() > 0)
 	    	insert.setColumns(columns);
+	    insert.setUseDuplicate(useDuplicate);
+	    insert.setDuplicateUpdateColumns(duplicateUpdateColumns);
+	    insert.setDuplicateUpdateExpressionList(duplicateUpdateExpressionList);
         insert.setReturningExpressionList(returning);
     	return insert;
     }

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

@@ -13,7 +13,7 @@
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.insert.Insert;
 import net.sf.jsqlparser.statement.select.PlainSelect;
-import static net.sf.jsqlparser.test.TestUtils.*;
+import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
@@ -147,4 +147,9 @@ public void testHexValues2() throws JSQLParserException {
 	public void testHexValues3() throws JSQLParserException {
 		assertSqlCanBeParsedAndDeparsed("INSERT INTO TABLE2 VALUES ('1', \"DSDD\", 0xabcde)");
 	}
+
+	@Test
+	public void testDuplicateKey() throws JSQLParserException {
+		assertSqlCanBeParsedAndDeparsed("INSERT INTO Users0 (UserId, Key, Value) VALUES (51311, 'T_211', 18) ON DUPLICATE KEY UPDATE Value = 18");
+	}
 }