Merge pull request #193 from packageOk/master

support INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]

Author: wumpz

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

@@ -48,6 +48,8 @@ public class Insert implements Statement {
     private boolean useDuplicate = false;
     private List<Column> duplicateUpdateColumns;
     private List<Expression> duplicateUpdateExpressionList;
+    private String modifierPriority = null;
+    private boolean modifierIgnore = false;
 
     private boolean returningAllColumns = false;
 
@@ -156,11 +158,34 @@ public void setDuplicateUpdateExpressionList(List<Expression> duplicateUpdateExp
         this.duplicateUpdateExpressionList = duplicateUpdateExpressionList;
     }
 
+    public String getModifierPriority() {
+        return modifierPriority;
+    }
+
+    public void setModifierPriority(String modifierPriority) {
+        this.modifierPriority = modifierPriority;
+    }
+
+    public boolean isModifierIgnore() {
+        return modifierIgnore;
+    }
+
+    public void setModifierIgnore(boolean modifierIgnore) {
+        this.modifierIgnore = modifierIgnore;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder();
 
-        sql.append("INSERT INTO ");
+        sql.append("INSERT ");
+        if(modifierPriority != null){
+            sql.append(modifierPriority + " ");
+        }
+        if(modifierIgnore){
+            sql.append("IGNORE ");
+        }
+        sql.append("INTO ");
         sql.append(table).append(" ");
         if (columns != null) {
             sql.append(PlainSelect.getStringList(columns, true, true)).append(" ");

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

@@ -74,7 +74,15 @@ public void setBuffer(StringBuilder buffer) {
     }
 
     public void deParse(Insert insert) {
-        buffer.append("INSERT INTO ");
+        buffer.append("INSERT ");
+        if(insert.getModifierPriority() != null){
+            buffer.append(insert.getModifierPriority() + " ");
+        }
+        if(insert.isModifierIgnore()){
+            buffer.append("IGNORE ");
+        }
+        buffer.append("INTO ");
+
         buffer.append(insert.getTable().getFullyQualifiedName());
         if (insert.getColumns() != null) {
             buffer.append(" (");

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

@@ -228,6 +228,10 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_CASCADE: "CASCADE">
 |   <K_RESTRICT: "RESTRICT">
 |   <K_DUPLICATE: "DUPLICATE">
+|	<K_LOW_PRIORITY : "LOW_PRIORITY">
+|	<K_DELAYED : "DELAYED">
+|	<K_HIGH_PRIORITY : "HIGH_PRIORITY">
+|	<K_IGNORE : "IGNORE">
 }
 
 TOKEN : /* Numeric Constants */
@@ -467,9 +471,18 @@ Insert Insert():
     boolean useDuplicate = false;
     List<Column> duplicateUpdateColumns = null;
     List<Expression> duplicateUpdateExpressionList = null;
+    Token tk = null;
+    String modifierPriority = null;
+    boolean modifierIgnore = false;
 }
 {
-    <K_INSERT> [<K_INTO>] table=Table()
+    <K_INSERT>
+    [(tk = <K_LOW_PRIORITY> | tk = <K_DELAYED> | tk = <K_HIGH_PRIORITY>)
+    {if (tk!=null)
+    	modifierPriority = tk.image.toUpperCase();
+    }]
+    [<K_IGNORE>{ modifierIgnore = true; }]
+    [<K_INTO>] table=Table()
 
 
      [LOOKAHEAD(2) "(" tableColumn=Column() { columns.add(tableColumn); } ("," tableColumn=Column() { columns.add(tableColumn); } )* ")"  ]
@@ -530,6 +543,8 @@ Insert Insert():
 	    insert.setDuplicateUpdateColumns(duplicateUpdateColumns);
 	    insert.setDuplicateUpdateExpressionList(duplicateUpdateExpressionList);
         insert.setReturningExpressionList(returning);
+        insert.setModifierPriority(modifierPriority);
+        insert.setModifierIgnore(modifierIgnore);
     	return insert;
     }
 }

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

@@ -152,4 +152,15 @@ public void testHexValues3() throws JSQLParserException {
 	public void testDuplicateKey() throws JSQLParserException {
 		assertSqlCanBeParsedAndDeparsed("INSERT INTO Users0 (UserId, Key, Value) VALUES (51311, 'T_211', 18) ON DUPLICATE KEY UPDATE Value = 18");
 	}
+
+    @Test
+    public void testModifierIgnore() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("INSERT IGNORE INTO `AoQiSurvey_FlashVersion_Single` VALUES (302215163, 'WIN 16,0,0,235')");
+    }
+
+    @Test
+    public void testModifierPriority() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("INSERT DELAYED INTO kvPair (value, key) VALUES (?, ?)");
+        assertSqlCanBeParsedAndDeparsed("INSERT LOW_PRIORITY INTO kvPair (value, key) VALUES (?, ?)");
+    }
 }