Add support for TableFunction [WITH OFFSET|ORDINALITY] (#2219)

davyboyhayes · David Hayes · web-flow · commit e5fa004cdffd · 2025-04-08T16:22:59.000+07:00
* Add support for TableFunction [WITH OFFSET|ORDINALITY] This PR fixes #2218, by adding a new `withClause` to a TableFunction, which allows for support of SQL-99's `UNNEST(...) WITH ORDINALITY` or GoogleSQL's `UNNEST(...) WITH OFFSET`. Currently, this is a feeler PR, as I'm getting a test failure, as the output of the parsing differs in my tests: ``` org.opentest4j.AssertionFailedError: Output from Deparser does not match. ==> Expected :select*from unnest(array[1,2,3])with offset as t(a,b) Actual :select*from unnest(array[1,2,3])as t(a,b) <Click to see difference> at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151) at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132) at org.junit.jupiter.api.AssertEquals.failNotEqual(AssertEquals.java:197) at org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:182) at org.junit.jupiter.api.Assertions.assertEquals(Assertions.java:1156) at net.sf.jsqlparser@5.2-SNAPSHOT/net.sf.jsqlparser.test.TestUtils.assertStatementCanBeDeparsedAs(TestUtils.java:126) at net.sf.jsqlparser@5.2-SNAPSHOT/net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed(TestUtils.java:99) at net.sf.jsqlparser@5.2-SNAPSHOT/net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed(TestUtils.java:85) at net.sf.jsqlparser@5.2-SNAPSHOT/net.sf.jsqlparser.statement.select.TableFunctionTest.testTableFunctionWithSupportedWithClauses(TableFunctionTest.java:60) at java.base/java.lang.reflect.Method.invoke(Method.java:580) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:184) at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:197) at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:179) at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:197) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:184) at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:197) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:184) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:184) at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:197) at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:1024) at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509) at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499) at java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:151) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:174) at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) at java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:596) at java.base/java.util.stream.ReferencePipeline$7$1.accept(ReferencePipeline.java:276) at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1708) at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509) at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499) at java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:151) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:174) at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) at java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:596) at java.base/java.util.stream.ReferencePipeline$7$1.accept(ReferencePipeline.java:276) at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:197) at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:197) at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:197) at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1708) at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509) at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499) at java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:151) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:174) at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) at java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:596) at java.base/java.util.stream.ReferencePipeline$7$1.accept(ReferencePipeline.java:276) at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1708) at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509) at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499) at java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:151) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:174) at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) at java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:596) ``` * rename clause -> withClause * Resolving test failure, and modifying the SelectDeParser to add the withClause where present * Addressing PR Review comments. Using existing WITH and OFFSET keywords, adding ORDINALITY keyword. * Removing ORDINALITY from the reserved keywords list in ParserKeywordsUtils, and updating pushing the result of `gradle updateKeywords` --------- Co-authored-by: David Hayes <dhayes@adobe.com>
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/TableFunction.java b/src/main/java/net/sf/jsqlparser/statement/select/TableFunction.java
@@ -20,6 +20,7 @@ public class TableFunction extends Function implements FromItem {
     private Pivot pivot = null;
     private UnPivot unPivot = null;
     private Function function;
+    private String withClause = null;
 
     public TableFunction(Function function) {
         this.function = function;
@@ -30,6 +31,17 @@ public TableFunction(String prefix, Function function) {
         this.function = function;
     }
 
+    public TableFunction(Function function, String withClause) {
+        this.function = function;
+        this.withClause = withClause;
+    }
+
+    public TableFunction(String prefix, Function function, String withClause) {
+        this.prefix = prefix;
+        this.function = function;
+        this.withClause = withClause;
+    }
+
     public TableFunction(String prefix, String name, Expression... parameters) {
         this.prefix = prefix;
         this.function = new Function(name, parameters);
@@ -62,6 +74,19 @@ public TableFunction setPrefix(String prefix) {
         return this;
     }
 
+    public String getWithClause() {
+        return withClause;
+    }
+
+    public void setWithClause(String withClause) {
+        this.withClause = withClause;
+    }
+
+    public TableFunction withWithClause(String withClause) {
+        this.withClause = withClause;
+        return this;
+    }
+
     @Override
     public <T, S> T accept(FromItemVisitor<T> fromItemVisitor, S context) {
         return fromItemVisitor.visit(this, context);
@@ -128,6 +153,10 @@ public StringBuilder appendTo(StringBuilder builder) {
         }
         builder.append(function.toString());
 
+        if (withClause != null) {
+            builder.append(" WITH ").append(withClause);
+        }
+
         if (alias != null) {
             builder.append(alias);
         }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -747,6 +747,10 @@ public <S> StringBuilder visit(TableFunction tableFunction, S context) {
         }
         tableFunction.getFunction().accept(this.expressionVisitor, context);
 
+        if (tableFunction.getWithClause() != null) {
+            builder.append(" WITH ").append(tableFunction.getWithClause());
+        }
+
         if (tableFunction.getAlias() != null) {
             builder.append(tableFunction.getAlias());
         }
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -391,6 +391,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_OR:"OR">
 |   <K_ORACLE_NAMED_PARAMETER_ASSIGNMENT: "=>">
 |   <K_ORDER:"ORDER">
+|   <K_ORDINALITY:"ORDINALITY">
 |   <K_OUTER:"OUTER">
 |   <K_OUTPUT:"OUTPUT">
 |   <K_OVER:"OVER">
@@ -2152,7 +2153,7 @@ String RelObjectNameWithoutValue() :
 {    Token tk = null; }
 {
     ( tk=<DATA_TYPE> | tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> |  tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR> | tk=<K_TEXT_LITERAL> 
-       | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="AGGREGATE" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COALESCE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="CORRESPONDING" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCARD" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCHANGE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="IMPORT" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="INVERSE" | tk="INVISIBLE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="KEY_BLOCK_SIZE" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NAME" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERRIDING" | tk="OVERWRITE" | tk="PARALLEL" | tk="PARENT" | tk="PARSER" | tk="PARTITION" | tk="PARTITIONING" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PLUS" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="REBUILD" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="REMOVE" | tk="RENAME" | tk="REORGANIZE" | tk="REPAIR" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="SPATIAL" | tk="STORED" | tk="STRICT" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VALIDATION" | tk="VERBOSE" | tk="VIEW" | tk="VISIBLE" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
+       | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="AGGREGATE" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COALESCE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="CORRESPONDING" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCARD" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCHANGE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="IMPORT" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="INVERSE" | tk="INVISIBLE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="KEY_BLOCK_SIZE" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NAME" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="ORDINALITY" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERRIDING" | tk="OVERWRITE" | tk="PARALLEL" | tk="PARENT" | tk="PARSER" | tk="PARTITION" | tk="PARTITIONING" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PLUS" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="REBUILD" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="REMOVE" | tk="RENAME" | tk="REORGANIZE" | tk="REPAIR" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="SPATIAL" | tk="STORED" | tk="STRICT" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VALIDATION" | tk="VERBOSE" | tk="VIEW" | tk="VISIBLE" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
     { return tk.image; }
 }
 
@@ -6636,14 +6637,20 @@ TableFunction TableFunction():
     Token prefix = null;
     Function function;
     TableFunction functionItem;
+    Token withClause = null;
 }
 {
     [ prefix = <K_LATERAL> ]
     function=Function()
+    [ <K_WITH> ( withClause = <K_OFFSET> | withClause = <K_ORDINALITY> ) ]
     {
         return  prefix!=null
-            ? new TableFunction(prefix.image, function)
-            : new TableFunction(function);
+            ? withClause!=null
+                ? new TableFunction(prefix.image, function, withClause.image)
+                : new TableFunction(prefix.image, function)
+            : withClause!=null
+                ? new TableFunction(function, withClause.image)
+                : new TableFunction(function);
     }
 }
 
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/TableFunctionTest.java b/src/test/java/net/sf/jsqlparser/statement/select/TableFunctionTest.java
@@ -12,6 +12,8 @@
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.test.TestUtils;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -47,4 +49,14 @@ void testTableFunctionWithNamedParameterWhereNameIsOuterKeyword() throws JSQLPar
                         "     lateral flatten(input => i.DATA_VALUE:Friends, outer => true) AS f1;";
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "OFFSET",
+            "ORDINALITY"
+    })
+    void testTableFunctionWithSupportedWithClauses(String withClause) throws JSQLParserException {
+        String sqlStr = "SELECT * FROM UNNEST(ARRAY[1, 2, 3]) WITH " + withClause + " AS t(a, b)";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
 }
diff --git a/src/test/resources/simple_parsing.txt b/src/test/resources/simple_parsing.txt
@@ -208,4 +208,6 @@ FROM EMPLOYEE THIS_EMP, DINFO, DINFOMAX
 WHERE THIS_EMP.JOB = 'SALESREP' 
 AND THIS_EMP.WORKDEPT = DINFO.DEPTNO  
 
-select * from Person where deptname='it' AND NOT (age=24) 
+select * from Person where deptname='it' AND NOT (age=24)
+
+select * from unnest(array[4,5,6]) with ordinality;

Original file line number	Diff line number	Diff line change
`@@ -747,6 +747,10 @@ public <S> StringBuilder visit(TableFunction tableFunction, S context) {`
`747`	`747`	`}`
`748`	`748`	`tableFunction.getFunction().accept(this.expressionVisitor, context);`
`749`	`749`
	`750`	`+ if (tableFunction.getWithClause() != null) {`
	`751`	`+ builder.append(" WITH ").append(tableFunction.getWithClause());`
	`752`	`+ }`
	`753`	`+`
`750`	`754`	`if (tableFunction.getAlias() != null) {`
`751`	`755`	`builder.append(tableFunction.getAlias());`
`752`	`756`	`}`
Original file line number	Diff line number	Diff line change
`@@ -391,6 +391,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */`
`391`	`391`	`\| <K_OR:"OR">`
`392`	`392`	`\| <K_ORACLE_NAMED_PARAMETER_ASSIGNMENT: "=>">`
`393`	`393`	`\| <K_ORDER:"ORDER">`
	`394`	`+\| <K_ORDINALITY:"ORDINALITY">`
`394`	`395`	`\| <K_OUTER:"OUTER">`
`395`	`396`	`\| <K_OUTPUT:"OUTPUT">`
`396`	`397`	`\| <K_OVER:"OVER">`
`@@ -2152,7 +2153,7 @@ String RelObjectNameWithoutValue() :`
`2152`	`2153`	`{ Token tk = null; }`
`2153`	`2154`	`{`
`2154`	`2155`	`( tk=<DATA_TYPE> \| tk=<S_IDENTIFIER> \| tk=<S_QUOTED_IDENTIFIER> \| tk=<K_DATE_LITERAL> \| tk=<K_DATETIMELITERAL> \| tk=<K_STRING_FUNCTION_NAME> \| tk=<K_ISOLATION> \| tk=<K_TIME_KEY_EXPR> \| tk=<K_TEXT_LITERAL>`
`2155`		- \| tk="ACTION" \| tk="ACTIVE" \| tk="ADD" \| tk="ADVANCE" \| tk="ADVISE" \| tk="AGAINST" \| tk="AGGREGATE" \| tk="ALGORITHM" \| tk="ALTER" \| tk="ANALYZE" \| tk="APPLY" \| tk="APPROXIMATE" \| tk="ARCHIVE" \| tk="ARRAY" \| tk="ASC" \| tk="AT" \| tk="AUTHORIZATION" \| tk="AUTO" \| tk="AUTO_INCREMENT" \| tk="BASE64" \| tk="BEGIN" \| tk="BERNOULLI" \| tk="BINARY" \| tk="BIT" \| tk="BLOCK" \| tk="BROWSE" \| tk="BUFFERS" \| tk="BY" \| tk="BYTE" \| tk="BYTES" \| tk="CACHE" \| tk="CALL" \| tk="CASCADE" \| tk="CASE" \| tk="CAST" \| tk="CHANGE" \| tk="CHANGES" \| tk="CHAR" \| tk="CHARACTER" \| tk="CHECKPOINT" \| tk="CLOSE" \| tk="COALESCE" \| tk="COLLATE" \| tk="COLUMN" \| tk="COLUMNS" \| tk="COMMENT" \| tk="COMMIT" \| tk="CONCURRENTLY" \| tk="CONFLICT" \| tk="CONSTRAINTS" \| tk="CONVERT" \| tk="CORRESPONDING" \| tk="COSTS" \| tk="COUNT" \| tk="CS" \| tk="CYCLE" \| tk="DATA" \| tk="DATABASE" \| tk="DATETIME" \| tk="DBA_RECYCLEBIN" \| tk="DDL" \| tk="DECLARE" \| tk="DEFERRABLE" \| tk="DELAYED" \| tk="DELETE" \| tk="DESC" \| tk="DESCRIBE" \| tk="DISABLE" \| tk="DISCARD" \| tk="DISCONNECT" \| tk="DIV" \| tk="DML" \| tk="DO" \| tk="DOMAIN" \| tk="DROP" \| tk="DUMP" \| tk="DUPLICATE" \| tk="ELEMENTS" \| tk="EMIT" \| tk="ENABLE" \| tk="ENCRYPTION" \| tk="END" \| tk="ENGINE" \| tk="ERROR" \| tk="ESCAPE" \| tk="EXCHANGE" \| tk="EXCLUDE" \| tk="EXEC" \| tk="EXECUTE" \| tk="EXPLAIN" \| tk="EXPLICIT" \| tk="EXTENDED" \| tk="EXTRACT" \| tk="FILTER" \| tk="FIRST" \| tk="FLUSH" \| tk="FN" \| tk="FOLLOWING" \| tk="FORMAT" \| tk="FULLTEXT" \| tk="FUNCTION" \| tk="GRANT" \| tk="GROUP_CONCAT" \| tk="GUARD" \| tk="HASH" \| tk="HIGH" \| tk="HIGH_PRIORITY" \| tk="HISTORY" \| tk="HOPPING" \| tk="IMPORT" \| tk="INCLUDE" \| tk="INCLUDE_NULL_VALUES" \| tk="INCREMENT" \| tk="INDEX" \| tk="INSERT" \| tk="INTERLEAVE" \| tk="INTERPRET" \| tk="INVALIDATE" \| tk="INVERSE" \| tk="INVISIBLE" \| tk="ISNULL" \| tk="JSON" \| tk="JSON_ARRAY" \| tk="JSON_ARRAYAGG" \| tk="JSON_OBJECT" \| tk="JSON_OBJECTAGG" \| tk="KEEP" \| tk="KEY" \| tk="KEYS" \| tk="KEY_BLOCK_SIZE" \| tk="LAST" \| tk="LEADING" \| tk="LESS" \| tk="LINK" \| tk="LOCAL" \| tk="LOCK" \| tk="LOCKED" \| tk="LOG" \| tk="LONGTEXT" \| tk="LOOP" \| tk="LOW" \| tk="LOW_PRIORITY" \| tk="MATCH" \| tk="MATCHED" \| tk="MATCH_ALL" \| tk="MATCH_ANY" \| tk="MATCH_PHRASE" \| tk="MATCH_PHRASE_PREFIX" \| tk="MATCH_REGEXP" \| tk="MATERIALIZED" \| tk="MAX" \| tk="MAXVALUE" \| tk="MEDIUMTEXT" \| tk="MEMBER" \| tk="MERGE" \| tk="MIN" \| tk="MINVALUE" \| tk="MODIFY" \| tk="MOVEMENT" \| tk="NAME" \| tk="NEXT" \| tk="NO" \| tk="NOCACHE" \| tk="NOKEEP" \| tk="NOLOCK" \| tk="NOMAXVALUE" \| tk="NOMINVALUE" \| tk="NOORDER" \| tk="NOTHING" \| tk="NOTNULL" \| tk="NOVALIDATE" \| tk="NOWAIT" \| tk="NULLS" \| tk="OF" \| tk="OFF" \| tk="OPEN" \| tk="OVER" \| tk="OVERFLOW" \| tk="OVERLAPS" \| tk="OVERRIDING" \| tk="OVERWRITE" \| tk="PARALLEL" \| tk="PARENT" \| tk="PARSER" \| tk="PARTITION" \| tk="PARTITIONING" \| tk="PATH" \| tk="PERCENT" \| tk="PLACING" \| tk="PLAN" \| tk="PLUS" \| tk="PRECEDING" \| tk="PRIMARY" \| tk="PURGE" \| tk="QUERY" \| tk="QUICK" \| tk="QUIESCE" \| tk="RANGE" \| tk="RAW" \| tk="READ" \| tk="REBUILD" \| tk="RECURSIVE" \| tk="RECYCLEBIN" \| tk="REFERENCES" \| tk="REFRESH" \| tk="REGEXP" \| tk="REGEXP_LIKE" \| tk="REGISTER" \| tk="REMOTE" \| tk="REMOVE" \| tk="RENAME" \| tk="REORGANIZE" \| tk="REPAIR" \| tk="REPEATABLE" \| tk="REPLACE" \| tk="RESET" \| tk="RESPECT" \| tk="RESTART" \| tk="RESTRICT" \| tk="RESTRICTED" \| tk="RESUMABLE" \| tk="RESUME" \| tk="RETURN" \| tk="RLIKE" \| tk="ROLLBACK" \| tk="ROLLUP" \| tk="ROOT" \| tk="ROW" \| tk="ROWS" \| tk="RR" \| tk="RS" \| tk="SAFE_CAST" \| tk="SAVEPOINT" \| tk="SCHEMA" \| tk="SECURE" \| tk="SEED" \| tk="SEPARATOR" \| tk="SEQUENCE" \| tk="SESSION" \| tk="SETS" \| tk="SHARE" \| tk="SHOW" \| tk="SHUTDOWN" \| tk="SIBLINGS" \| tk="SIGNED" \| tk="SIMILAR" \| tk="SIZE" \| tk="SKIP" \| tk="SPATIAL" \| tk="STORED" \| tk="STRICT" \| tk="STRING" \| tk="STRUCT" \| tk="SUMMARIZE" \| tk="SUSPEND" \| tk="SWITCH" \| tk="SYNONYM" \| tk="SYSTEM" \| tk="TABLE" \| tk="TABLESPACE" \| tk="TEMP" \| tk="TEMPORARY" \| tk="TEXT" \| tk="THAN" \| tk="THEN" \| tk="TIMEOUT" \| tk="TIMESTAMPTZ" \| tk="TIMEZONE" \| tk="TINYTEXT" \| tk="TO" \| tk="TRIGGER" \| tk="TRUNCATE" \| tk="TRY_CAST" \| tk="TUMBLING" \| tk="TYPE" \| tk="UNLOGGED" \| tk="UNQIESCE" \| tk="UNSIGNED" \| tk="UPDATE" \| tk="UPSERT" \| tk="UR" \| tk="USER" \| tk="VALIDATE" \| tk="VALIDATION" \| tk="VERBOSE" \| tk="VIEW" \| tk="VISIBLE" \| tk="VOLATILE" \| tk="WAIT" \| tk="WITHIN" \| tk="WITHOUT" \| tk="WITHOUT_ARRAY_WRAPPER" \| tk="WORK" \| tk="XML" \| tk="XMLAGG" \| tk="XMLDATA" \| tk="XMLSCHEMA" \| tk="XMLTEXT" \| tk="XSINIL" \| tk="YAML" \| tk="YES" \| tk="ZONE" )
	`2156`	+ \| tk="ACTION" \| tk="ACTIVE" \| tk="ADD" \| tk="ADVANCE" \| tk="ADVISE" \| tk="AGAINST" \| tk="AGGREGATE" \| tk="ALGORITHM" \| tk="ALTER" \| tk="ANALYZE" \| tk="APPLY" \| tk="APPROXIMATE" \| tk="ARCHIVE" \| tk="ARRAY" \| tk="ASC" \| tk="AT" \| tk="AUTHORIZATION" \| tk="AUTO" \| tk="AUTO_INCREMENT" \| tk="BASE64" \| tk="BEGIN" \| tk="BERNOULLI" \| tk="BINARY" \| tk="BIT" \| tk="BLOCK" \| tk="BROWSE" \| tk="BUFFERS" \| tk="BY" \| tk="BYTE" \| tk="BYTES" \| tk="CACHE" \| tk="CALL" \| tk="CASCADE" \| tk="CASE" \| tk="CAST" \| tk="CHANGE" \| tk="CHANGES" \| tk="CHAR" \| tk="CHARACTER" \| tk="CHECKPOINT" \| tk="CLOSE" \| tk="COALESCE" \| tk="COLLATE" \| tk="COLUMN" \| tk="COLUMNS" \| tk="COMMENT" \| tk="COMMIT" \| tk="CONCURRENTLY" \| tk="CONFLICT" \| tk="CONSTRAINTS" \| tk="CONVERT" \| tk="CORRESPONDING" \| tk="COSTS" \| tk="COUNT" \| tk="CS" \| tk="CYCLE" \| tk="DATA" \| tk="DATABASE" \| tk="DATETIME" \| tk="DBA_RECYCLEBIN" \| tk="DDL" \| tk="DECLARE" \| tk="DEFERRABLE" \| tk="DELAYED" \| tk="DELETE" \| tk="DESC" \| tk="DESCRIBE" \| tk="DISABLE" \| tk="DISCARD" \| tk="DISCONNECT" \| tk="DIV" \| tk="DML" \| tk="DO" \| tk="DOMAIN" \| tk="DROP" \| tk="DUMP" \| tk="DUPLICATE" \| tk="ELEMENTS" \| tk="EMIT" \| tk="ENABLE" \| tk="ENCRYPTION" \| tk="END" \| tk="ENGINE" \| tk="ERROR" \| tk="ESCAPE" \| tk="EXCHANGE" \| tk="EXCLUDE" \| tk="EXEC" \| tk="EXECUTE" \| tk="EXPLAIN" \| tk="EXPLICIT" \| tk="EXTENDED" \| tk="EXTRACT" \| tk="FILTER" \| tk="FIRST" \| tk="FLUSH" \| tk="FN" \| tk="FOLLOWING" \| tk="FORMAT" \| tk="FULLTEXT" \| tk="FUNCTION" \| tk="GRANT" \| tk="GROUP_CONCAT" \| tk="GUARD" \| tk="HASH" \| tk="HIGH" \| tk="HIGH_PRIORITY" \| tk="HISTORY" \| tk="HOPPING" \| tk="IMPORT" \| tk="INCLUDE" \| tk="INCLUDE_NULL_VALUES" \| tk="INCREMENT" \| tk="INDEX" \| tk="INSERT" \| tk="INTERLEAVE" \| tk="INTERPRET" \| tk="INVALIDATE" \| tk="INVERSE" \| tk="INVISIBLE" \| tk="ISNULL" \| tk="JSON" \| tk="JSON_ARRAY" \| tk="JSON_ARRAYAGG" \| tk="JSON_OBJECT" \| tk="JSON_OBJECTAGG" \| tk="KEEP" \| tk="KEY" \| tk="KEYS" \| tk="KEY_BLOCK_SIZE" \| tk="LAST" \| tk="LEADING" \| tk="LESS" \| tk="LINK" \| tk="LOCAL" \| tk="LOCK" \| tk="LOCKED" \| tk="LOG" \| tk="LONGTEXT" \| tk="LOOP" \| tk="LOW" \| tk="LOW_PRIORITY" \| tk="MATCH" \| tk="MATCHED" \| tk="MATCH_ALL" \| tk="MATCH_ANY" \| tk="MATCH_PHRASE" \| tk="MATCH_PHRASE_PREFIX" \| tk="MATCH_REGEXP" \| tk="MATERIALIZED" \| tk="MAX" \| tk="MAXVALUE" \| tk="MEDIUMTEXT" \| tk="MEMBER" \| tk="MERGE" \| tk="MIN" \| tk="MINVALUE" \| tk="MODIFY" \| tk="MOVEMENT" \| tk="NAME" \| tk="NEXT" \| tk="NO" \| tk="NOCACHE" \| tk="NOKEEP" \| tk="NOLOCK" \| tk="NOMAXVALUE" \| tk="NOMINVALUE" \| tk="NOORDER" \| tk="NOTHING" \| tk="NOTNULL" \| tk="NOVALIDATE" \| tk="NOWAIT" \| tk="NULLS" \| tk="OF" \| tk="OFF" \| tk="OPEN" \| tk="ORDINALITY" \| tk="OVER" \| tk="OVERFLOW" \| tk="OVERLAPS" \| tk="OVERRIDING" \| tk="OVERWRITE" \| tk="PARALLEL" \| tk="PARENT" \| tk="PARSER" \| tk="PARTITION" \| tk="PARTITIONING" \| tk="PATH" \| tk="PERCENT" \| tk="PLACING" \| tk="PLAN" \| tk="PLUS" \| tk="PRECEDING" \| tk="PRIMARY" \| tk="PURGE" \| tk="QUERY" \| tk="QUICK" \| tk="QUIESCE" \| tk="RANGE" \| tk="RAW" \| tk="READ" \| tk="REBUILD" \| tk="RECURSIVE" \| tk="RECYCLEBIN" \| tk="REFERENCES" \| tk="REFRESH" \| tk="REGEXP" \| tk="REGEXP_LIKE" \| tk="REGISTER" \| tk="REMOTE" \| tk="REMOVE" \| tk="RENAME" \| tk="REORGANIZE" \| tk="REPAIR" \| tk="REPEATABLE" \| tk="REPLACE" \| tk="RESET" \| tk="RESPECT" \| tk="RESTART" \| tk="RESTRICT" \| tk="RESTRICTED" \| tk="RESUMABLE" \| tk="RESUME" \| tk="RETURN" \| tk="RLIKE" \| tk="ROLLBACK" \| tk="ROLLUP" \| tk="ROOT" \| tk="ROW" \| tk="ROWS" \| tk="RR" \| tk="RS" \| tk="SAFE_CAST" \| tk="SAVEPOINT" \| tk="SCHEMA" \| tk="SECURE" \| tk="SEED" \| tk="SEPARATOR" \| tk="SEQUENCE" \| tk="SESSION" \| tk="SETS" \| tk="SHARE" \| tk="SHOW" \| tk="SHUTDOWN" \| tk="SIBLINGS" \| tk="SIGNED" \| tk="SIMILAR" \| tk="SIZE" \| tk="SKIP" \| tk="SPATIAL" \| tk="STORED" \| tk="STRICT" \| tk="STRING" \| tk="STRUCT" \| tk="SUMMARIZE" \| tk="SUSPEND" \| tk="SWITCH" \| tk="SYNONYM" \| tk="SYSTEM" \| tk="TABLE" \| tk="TABLESPACE" \| tk="TEMP" \| tk="TEMPORARY" \| tk="TEXT" \| tk="THAN" \| tk="THEN" \| tk="TIMEOUT" \| tk="TIMESTAMPTZ" \| tk="TIMEZONE" \| tk="TINYTEXT" \| tk="TO" \| tk="TRIGGER" \| tk="TRUNCATE" \| tk="TRY_CAST" \| tk="TUMBLING" \| tk="TYPE" \| tk="UNLOGGED" \| tk="UNQIESCE" \| tk="UNSIGNED" \| tk="UPDATE" \| tk="UPSERT" \| tk="UR" \| tk="USER" \| tk="VALIDATE" \| tk="VALIDATION" \| tk="VERBOSE" \| tk="VIEW" \| tk="VISIBLE" \| tk="VOLATILE" \| tk="WAIT" \| tk="WITHIN" \| tk="WITHOUT" \| tk="WITHOUT_ARRAY_WRAPPER" \| tk="WORK" \| tk="XML" \| tk="XMLAGG" \| tk="XMLDATA" \| tk="XMLSCHEMA" \| tk="XMLTEXT" \| tk="XSINIL" \| tk="YAML" \| tk="YES" \| tk="ZONE" )
`2156`	`2157`	`{ return tk.image; }`
`2157`	`2158`	`}`
`2158`	`2159`
`@@ -6636,14 +6637,20 @@ TableFunction TableFunction():`
`6636`	`6637`	`Token prefix = null;`
`6637`	`6638`	`Function function;`
`6638`	`6639`	`TableFunction functionItem;`
	`6640`	`+ Token withClause = null;`
`6639`	`6641`	`}`
`6640`	`6642`	`{`
`6641`	`6643`	`[ prefix = <K_LATERAL> ]`
`6642`	`6644`	`function=Function()`
	`6645`	`+ [ <K_WITH> ( withClause = <K_OFFSET> \| withClause = <K_ORDINALITY> ) ]`
`6643`	`6646`	`{`
`6644`	`6647`	`return prefix!=null`
`6645`		`- ? new TableFunction(prefix.image, function)`
`6646`		`- : new TableFunction(function);`
	`6648`	`+ ? withClause!=null`
	`6649`	`+ ? new TableFunction(prefix.image, function, withClause.image)`
	`6650`	`+ : new TableFunction(prefix.image, function)`
	`6651`	`+ : withClause!=null`
	`6652`	`+ ? new TableFunction(function, withClause.image)`
	`6653`	`+ : new TableFunction(function);`
`6647`	`6654`	`}`
`6648`	`6655`	`}`
`6649`	`6656`