fixes #707

Author: wumpz

README.md

@@ -55,6 +55,7 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 2.0
 
+* support for **NEXTVAL FOR**
 * changed all source code license headers to reflect the dual license of JSqlParser more correctly
 * support of **OPTIMIZE FOR 20 ROWS** like expressions
 * allowed conditions within **then** and **else** of a **case** statement

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java

@@ -29,14 +29,14 @@
 import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
 import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
+import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
 import net.sf.jsqlparser.expression.operators.relational.Matches;
 import net.sf.jsqlparser.expression.operators.relational.MinorThan;
 import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
 import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMySQLOperator;
-import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.SubSelect;
 
@@ -155,7 +155,7 @@ public interface ExpressionVisitor {
     void visit(KeepExpression aexpr);
 
     void visit(MySQLGroupConcat groupConcat);
-    
+
     void visit(ValueListExpression valueList);
 
     void visit(RowConstructor rowConstructor);
@@ -168,4 +168,6 @@ public interface ExpressionVisitor {
 
     public void visit(NotExpression aThis);
 
+    public void visit(NextValExpression aThis);
+
 }

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java

@@ -12,7 +12,6 @@
 import net.sf.jsqlparser.expression.operators.arithmetic.*;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
-import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 import net.sf.jsqlparser.expression.operators.relational.*;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.AllColumns;
@@ -341,7 +340,6 @@ public void visit(NamedExpressionList namedExpressionList) {
         }
     }
 
-
     @Override
     public void visit(MultiExpressionList multiExprList) {
         for (ExpressionList list : multiExprList.getExprList()) {
@@ -412,7 +410,7 @@ public void visit(MySQLGroupConcat groupConcat) {
             }
         }
     }
-    
+
     @Override
     public void visit(ValueListExpression valueListExpression) {
         for (Expression expr : valueListExpression.getExpressionList().getExpressions()) {
@@ -493,7 +491,10 @@ public void visit(TimeKeyExpression timeKeyExpression) {
 
     @Override
     public void visit(DateTimeLiteralExpression literal) {
+    }
 
+    @Override
+    public void visit(NextValExpression nextVal) {
     }
 
 }

src/main/java/net/sf/jsqlparser/expression/NextValExpression.java

@@ -0,0 +1,43 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+import java.util.List;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class NextValExpression extends ASTNodeAccessImpl implements Expression {
+
+    private List<String> nameList;
+
+    public NextValExpression(List<String> nameList) {
+        this.nameList = nameList;
+    }
+
+    public String getName() {
+        StringBuilder b = new StringBuilder();
+        for (String name : nameList) {
+            if (b.length() > 0) {
+                b.append(".");
+            }
+            b.append(name);
+        }
+        return b.toString();
+    }
+
+    @Override
+    public String toString() {
+        return "NEXTVAL FOR " + getName();
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+}

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -32,6 +32,7 @@
 import net.sf.jsqlparser.expression.KeepExpression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.MySQLGroupConcat;
+import net.sf.jsqlparser.expression.NextValExpression;
 import net.sf.jsqlparser.expression.NotExpression;
 import net.sf.jsqlparser.expression.NullValue;
 import net.sf.jsqlparser.expression.NumericBind;
@@ -835,4 +836,8 @@ public void visit(DescribeStatement describe) {
     public void visit(ExplainStatement explain) {
         explain.getStatement().accept(this);
     }
+
+    @Override
+    public void visit(NextValExpression arg0) {
+    }
 }

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

@@ -32,6 +32,7 @@
 import net.sf.jsqlparser.expression.KeepExpression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.MySQLGroupConcat;
+import net.sf.jsqlparser.expression.NextValExpression;
 import net.sf.jsqlparser.expression.NotExpression;
 import net.sf.jsqlparser.expression.NullValue;
 import net.sf.jsqlparser.expression.NumericBind;
@@ -781,4 +782,9 @@ public void visit(DateTimeLiteralExpression literal) {
         buffer.append(literal.toString());
     }
 
+    @Override
+    public void visit(NextValExpression nextVal) {
+        buffer.append("NEXTVAL FOR ").append(nextVal.getName());
+    }
+
 }

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

@@ -203,6 +203,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_MODIFY: "MODIFY">
 |   <K_NATURAL:"NATURAL">
 |   <K_NEXT:"NEXT">
+|   <K_NEXTVAL:"NEXTVAL">
 |   <K_NO:"NO">
 |   <K_NOCYCLE:"NOCYCLE">
 |   <K_NOT:"NOT">
@@ -2695,6 +2696,8 @@ Expression PrimaryExpression() #PrimaryExpression:
 
 	| LOOKAHEAD(2) retval = IntervalExpression()
 
+    | retval = NextValExpression()
+
     | retval=Column() 
 
     | LOOKAHEAD("(" SimpleExpression() ")") "(" retval=SimpleExpression() ")" {retval = new Parenthesis(retval); }
@@ -2726,6 +2729,16 @@ Expression PrimaryExpression() #PrimaryExpression:
     }
 }
 
+NextValExpression NextValExpression() : {
+    List<String> data = new ArrayList<String>();
+}
+{
+    <K_NEXTVAL> <K_FOR> data = RelObjectNameList()
+    {
+        return new NextValExpression(data);
+    }
+}
+
 JdbcNamedParameter JdbcNamedParameter() : {
     JdbcNamedParameter parameter = new JdbcNamedParameter();
     String name;

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

@@ -293,4 +293,9 @@ public void testInsertKeyWordIntervalIssue682() throws JSQLParserException {
     public void testWithAtFront() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("WITH foo AS ( SELECT attr FROM bar ) INSERT INTO lalelu (attr) SELECT attr FROM foo");
     }
+
+    @Test
+    public void testNextVal() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("INSERT INTO tracker (monitor_id, user_id, module_name, item_id, item_summary, team_id, date_modified, action, visible, id) VALUES (?, ?, ?, ?, ?, ?, to_date(?, 'YYYY-MM-DD HH24:MI:SS'), ?, ?, NEXTVAL FOR TRACKER_ID_SEQ)");
+    }
 }

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

@@ -41,7 +41,7 @@ public class SelectTest {
 
     @Before
     public void setup() {
-        System.out.println(name.getMethodName());
+//        System.out.println(name.getMethodName());
     }
 
     // From statement multipart