Merge origin/master

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

Author: wumpz

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

@@ -1749,13 +1749,15 @@ FromItem SubJoin():
 {
     FromItem fromItem = null;
     Join join = null;
-    List joinList = null;
-    SubJoin subJoin = new SubJoin();
+    List<Join> joinList = null;
 }
 {
-    fromItem=FromItem() { subJoin.setLeft(fromItem); }
-	joinList=SubJoinsList() { subJoin.setJoinList(joinList); }
+    fromItem=FromItem() 
+	joinList=SubJoinsList()
     {
+		SubJoin subJoin = new SubJoin();
+		subJoin.setLeft(fromItem);
+		subJoin.setJoinList(joinList);
         return subJoin;
     }
 }
@@ -1778,7 +1780,6 @@ List SubJoinsList():
 {
 
     (join=JoinerExpression() { joinsList.add(join); })+
-
     { return joinsList; }
 }
 

src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java

@@ -360,7 +360,7 @@ public void testAddConstraintKeyIssue320() throws JSQLParserException {
     }
 
     @Test
-    public void testIssue633() throws JSQLParserException {
+    public void testIssue633() throws JSQLParserException, JSQLParserException, JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE team_phases ADD CONSTRAINT team_phases_id_key UNIQUE (id)");
     }
 
@@ -383,4 +383,9 @@ public void testAlterTableIndex586() throws Exception {
     public void testIssue259() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE feature_v2 ADD COLUMN third_user_id int (10) unsigned DEFAULT '0' COMMENT '第三方用户id' after kdt_id");
     }
+    
+    @Test
+    public void testIssue633_2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE INDEX idx_american_football_action_plays_1 ON american_football_action_plays USING btree (play_type)");
+    }
 }

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -2182,6 +2182,12 @@ public void testValues6BothVariants() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
 
+    @Test
+    public void testIntervalWithColumn() throws JSQLParserException {
+        String stmt = "SELECT DATE_ADD(start_date, INTERVAL duration MINUTE) AS end_datetime FROM appointment";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
+
     @Test
     public void testInterval1() throws JSQLParserException {
         String stmt = "SELECT 5 + INTERVAL '3 days'";

src/test/java/net/sf/jsqlparser/statement/update/UpdateTest.java

@@ -150,4 +150,9 @@ public void testUpdateIssue826() throws JSQLParserException {
                 + "where message_topic.name='test' \n"
                 + "AND message_topic_config.enable_flag='Y'", true);
     }
+
+    @Test
+    public void testUpdateIssue750() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("update a,(select * from c) b set a.id=b.id where a.id=b.id", true);
+    }
 }