feat: FETCH uses EXPRESSION

- `FETCH` uses `EXPRESSION` instead of SimpleJDBCParameter only - Visit/Accept `FETCH` `EXPRESSION` instead of `append` to String - Visit/Accept `OFFSET` `EXPRESSION` instead of `append` to String - Gradle: remove obsolete/incompatible `jvmArgs` from Test()
JSQLParser · wumpz · Apr 27, 2023 · Dec 11, 2022 · Dec 22, 2022 · Jan 8, 2023
commit 0979b2e5ea76b8c49d02e24fba7994cb750aa2e6
diff --git a/build.gradle b/build.gradle
@@ -106,12 +106,6 @@ test {
     minHeapSize = "128m"
     maxHeapSize = "1G"
 
-    jvmArgs << [
-            '-Djunit.jupiter.execution.parallel.enabled=true',
-            '-Djunit.jupiter.execution.parallel.config.strategy=dynamic',
-            '-Djunit.jupiter.execution.parallel.mode.default=concurrent'
-    ]
-
     finalizedBy check
 }
 

diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Fetch.java b/src/main/java/net/sf/jsqlparser/statement/select/Fetch.java
@@ -9,27 +9,41 @@
  */
 package net.sf.jsqlparser.statement.select;
 
-import net.sf.jsqlparser.expression.JdbcParameter;
+import net.sf.jsqlparser.expression.*;
 
 import java.io.Serializable;
 
 public class Fetch implements Serializable {
-
-    private long rowCount;
-    private JdbcParameter fetchJdbcParameter = null;
+    private Expression expression = null;
     private boolean isFetchParamFirst = false;
     private String fetchParam = "ROW";
 
+    @Deprecated
     public long getRowCount() {
-        return rowCount;
+        return expression instanceof LongValue ? ((LongValue) expression).getValue() : null;
     }
 
+    @Deprecated
     public void setRowCount(long l) {
-        rowCount = l;
+        setExpression( new LongValue(l));
+    }
+
+    public Expression getExpression() {
+        return expression;
+    }
+
+    public void setExpression(Expression expression) {
+        this.expression = expression;
+    }
+
+    public Fetch withExpression(Expression expression) {
+        this.setExpression(expression);
+        return this;
     }
 
+    @Deprecated
     public JdbcParameter getFetchJdbcParameter() {
-        return fetchJdbcParameter;
+        return expression instanceof JdbcParameter ? (JdbcParameter) expression : null;
     }
 
     public String getFetchParam() {
@@ -40,8 +54,9 @@ public boolean isFetchParamFirst() {
         return isFetchParamFirst;
     }
 
+    @Deprecated
     public void setFetchJdbcParameter(JdbcParameter jdbc) {
-        fetchJdbcParameter = jdbc;
+        this.setExpression(jdbc);
     }
 
     public void setFetchParam(String s) {
@@ -55,8 +70,7 @@ public void setFetchParamFirst(boolean b) {
     @Override
     public String toString() {
         return " FETCH " + (isFetchParamFirst ? "FIRST" : "NEXT") + " " 
-                + (fetchJdbcParameter!=null ? fetchJdbcParameter.toString() : 
-                    Long.toString(rowCount)) + " " + fetchParam + " ONLY";
+                + expression.toString() + " " + fetchParam + " ONLY";
     }
 
     public Fetch withRowCount(long rowCount) {

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -198,10 +198,10 @@ public void visit(PlainSelect plainSelect) {
             new LimitDeparser(buffer).deParse(plainSelect.getLimit());
         }
         if (plainSelect.getOffset() != null) {
-            deparseOffset(plainSelect.getOffset());
+            visit(plainSelect.getOffset());
         }
         if (plainSelect.getFetch() != null) {
-            deparseFetch(plainSelect.getFetch());
+            visit(plainSelect.getFetch());
         }
         if (plainSelect.getWithIsolation() != null) {
             buffer.append(plainSelect.getWithIsolation().toString());
@@ -349,30 +349,26 @@ public void visit(PivotXml pivot) {
         buffer.append("))");
     }
 
-    public void deparseOffset(Offset offset) {
+    public void visit(Offset offset) {
         // OFFSET offset
         // or OFFSET offset (ROW | ROWS)
         buffer.append(" OFFSET ");
-        buffer.append(offset.getOffset());
+        offset.getOffset().accept(expressionVisitor);
         if (offset.getOffsetParam() != null) {
             buffer.append(" ").append(offset.getOffsetParam());
         }
 
     }
 
-    public void deparseFetch(Fetch fetch) {
+    public void visit(Fetch fetch) {
         // FETCH (FIRST | NEXT) row_count (ROW | ROWS) ONLY
         buffer.append(" FETCH ");
         if (fetch.isFetchParamFirst()) {
             buffer.append("FIRST ");
         } else {
             buffer.append("NEXT ");
         }
-        if (fetch.getFetchJdbcParameter() != null) {
-            buffer.append(fetch.getFetchJdbcParameter().toString());
-        } else {
-            buffer.append(fetch.getRowCount());
-        }
+        fetch.getExpression().accept(expressionVisitor);
         buffer.append(" ").append(fetch.getFetchParam()).append(" ONLY");
 
     }
@@ -490,10 +486,10 @@ public void visit(SetOperationList list) {
             new LimitDeparser(buffer).deParse(list.getLimit());
         }
         if (list.getOffset() != null) {
-            deparseOffset(list.getOffset());
+            visit(list.getOffset());
         }
         if (list.getFetch() != null) {
-            deparseFetch(list.getFetch());
+            visit(list.getFetch());
         }
         if (list.getWithIsolation() != null) {
             buffer.append(list.getWithIsolation().toString());

diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -3079,19 +3079,15 @@ Fetch Fetch():
 {
     Fetch fetch = new Fetch();
     Token token = null;
-    JdbcParameter jdbc;
+    Expression expression;
 }
 {
     (
-            // sqlserver-oracle-> FETCH (FIRST | NEXT) row_count (ROW | ROWS) ONLY
-             <K_FETCH>
-                  (<K_FIRST> { fetch.setFetchParamFirst(true); } | <K_NEXT>)
-                 (token=<S_LONG> { fetch.setRowCount(Long.parseLong(token.image)); }
-                 | jdbc = SimpleJdbcParameter() { fetch.setFetchJdbcParameter(jdbc); } ) /* "?" { fetch.setFetchJdbcParameter(true); } ) */
-                 (<K_ROWS> { fetch.setFetchParam("ROWS"); } | <K_ROW>)
-                 <K_ONLY>
-
-        )
+        // sqlserver-oracle-> FETCH (FIRST | NEXT) expression (ROW | ROWS) ONLY
+        <K_FETCH> (<K_FIRST> { fetch.setFetchParamFirst(true); } | <K_NEXT>)
+        expression = Expression() { fetch.setExpression(expression); }
+        (<K_ROWS> { fetch.setFetchParam("ROWS"); } | <K_ROW>) <K_ONLY>
+    )
     {
         return fetch;
     }

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/FetchTest.java b/src/test/java/net/sf/jsqlparser/statement/select/FetchTest.java
@@ -0,0 +1,27 @@
+package net.sf.jsqlparser.statement.select;
+
+import net.sf.jsqlparser.*;
+import net.sf.jsqlparser.statement.*;
+import net.sf.jsqlparser.test.*;
+import org.junit.jupiter.api.*;
+
+class FetchTest {
+    @Test
+    void testParser() throws JSQLParserException {
+        String sqlStr = "SELECT table_schema \n" +
+                        "FROM information_schema.tables \n" +
+                        "fetch next :variable rows only";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
+
+    @Test
+    void getExpression() throws JSQLParserException {
+        String sqlStr = "SELECT table_schema \n" +
+                                "FROM information_schema.tables \n" +
+                                "fetch next (SELECT 1 FROM DUAL) rows only";
+        Select select = (Select) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+        Fetch fetch = plainSelect.getFetch();
+        Assertions.assertInstanceOf( SubSelect.class, fetch.getExpression());
+    }
+}