Merge remote-tracking branch 'origin/master'

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

Author: wanghai

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

@@ -227,6 +227,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_MATCHED: "MATCHED">
 |   <K_CASCADE: "CASCADE">
 |   <K_RESTRICT: "RESTRICT">
+|   <K_DUPLICATE: "DUPLICATE">
 |	<K_LOW_PRIORITY : "LOW_PRIORITY">
 |	<K_DELAYED : "DELAYED">
 |	<K_HIGH_PRIORITY : "HIGH_PRIORITY">
@@ -506,8 +507,8 @@ Insert Insert():
         )
 	)
 
-	[ "ON DUPLICATE KEY UPDATE"
-	    { useDuplicate = true;}
+	[ <K_ON> <K_DUPLICATE> <K_KEY> <K_UPDATE>
+	    { useDuplicate = true; }
 	  tableColumn=Column() "=" exp=SimpleExpression()
 	    {
 	        duplicateUpdateColumns = new ArrayList<Column>();
@@ -1209,12 +1210,12 @@ Join JoinerExpression():
         right=FromItem()
 
 
-	[
-		( <K_ON> onExpression=Expression()  { join.setOnExpression(onExpression); } )
+    [ 
+	LOOKAHEAD(2) (( <K_ON> onExpression=Expression()  { join.setOnExpression(onExpression); } )
 		|
 		( <K_USING> "(" tableColumn=Column() { columns = new ArrayList(); columns.add(tableColumn); }
 				("," tableColumn=Column() { columns.add(tableColumn); } )* ")"
-		  { join.setUsingColumns(columns); }   )
+		  { join.setUsingColumns(columns); }   ))
   	]
   {
   	join.setRightItem(right);