fixes #682

Author: wumpz

nb-configuration.xml

@@ -13,7 +13,7 @@
 		That way multiple projects can share the same settings (useful for formatting rules for example).
 		Any value defined here will override the pom.xml file value but is only applicable to the current project.
 		-->
-        <netbeans.compile.on.save>all</netbeans.compile.on.save>
+        <netbeans.compile.on.save>none</netbeans.compile.on.save>
         <com-junichi11-netbeans-changelf.enable>false</com-junichi11-netbeans-changelf.enable>
         <com-junichi11-netbeans-changelf.use-project>true</com-junichi11-netbeans-changelf.use-project>
         <com-junichi11-netbeans-changelf.lf-kind>LF</com-junichi11-netbeans-changelf.lf-kind>

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

@@ -1024,7 +1024,7 @@ Normal names.
 String RelObjectName() :
 {    Token tk = null; String result = null; }
 {
-    (result = RelObjectNameWithoutValue() | tk=<K_VALUE> | tk=<K_VALUES>)
+    (result = RelObjectNameWithoutValue() | tk=<K_VALUE> | tk=<K_VALUES> | tk=<K_INTERVAL>)
 
     { 
 		if (tk!=null) result=tk.image;
@@ -2550,6 +2550,8 @@ Expression PrimaryExpression() #PrimaryExpression:
 
     | LOOKAHEAD(2) retval=DateTimeLiteralExpression()
 
+	| LOOKAHEAD(2) retval = IntervalExpression()
+
     | retval=Column()
 
     | LOOKAHEAD("(" SimpleExpression() ")") "(" retval=SimpleExpression() ")" {retval = new Parenthesis(retval); }
@@ -2563,8 +2565,6 @@ Expression PrimaryExpression() #PrimaryExpression:
     | "{t" token=<S_CHAR_LITERAL> "}"  { retval = new TimeValue(token.image); }
 
     | "{ts" token=<S_CHAR_LITERAL> "}" { retval = new TimestampValue(token.image); }
-
-    | retval = IntervalExpression()
 )
 
     ( "::" type=ColDataType() {
@@ -3571,6 +3571,21 @@ AlterExpression AlterExpression():
       (
 		LOOKAHEAD(2) ( <K_PRIMARY> <K_KEY> columnNames=ColumnsNamesList() { alterExp.setPkColumns(columnNames); } ) constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
 		|
+          LOOKAHEAD(2) ( 
+                tk=<K_INDEX>
+                  sk3=ColumnsNamesListItem()
+                  {
+					  columnNames = new ArrayList();
+				      columnNames.add(sk3);
+
+                      index = new NamedConstraint();
+                      index.setType(tk.image);
+                      index.setColumnsNames(columnNames);
+                      alterExp.setIndex(index);
+                  }
+                  constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
+            )
+		|
         ( (LOOKAHEAD(2) <K_COLUMN>)?
             alterExpressionColumnDataType = AlterExpressionColumnDataType() { alterExp.addColDataType(alterExpressionColumnDataType); }
         )
@@ -3657,7 +3672,8 @@ AlterExpression AlterExpression():
                       alterExp.setIndex(index);
                   }
                   constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
-            ) )
+            )
+			 )
         )
         )
     )

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

@@ -12,6 +12,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class AlterTest {
@@ -310,4 +311,10 @@ public void testAddConstraintKeyIssue320() throws JSQLParserException {
     public void testIssue633() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE team_phases ADD CONSTRAINT team_phases_id_key UNIQUE (id)");
     }
+
+    @Test
+    @Ignore
+    public void testIssue679() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("ALTER TABLE tb_session_status ADD INDEX idx_user_id(user_id)");
+    }
 }

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

@@ -274,6 +274,11 @@ public void testInsertKeyWordEnableIssue592() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("INSERT INTO T_USER (ID, EMAIL_VALIDATE, ENABLE, PASSWORD) VALUES (?, ?, ?, ?)");
     }
 
+    @Test
+    public void testInsertKeyWordIntervalIssue682() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("INSERT INTO BILLING_TASKS (TIMEOUT, INTERVAL, RETRY_UPON_FAILURE, END_DATE, MAX_RETRY_COUNT, CONTINUOUS, NAME, LAST_RUN, START_TIME, NEXT_RUN, ID, UNIQUE_NAME, INTERVAL_TYPE) VALUES (?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?, ?, ?)");
+    }
+
     @Test
     @Ignore
     public void testWithAtFront() throws JSQLParserException {