Addressing PR Review comments. Using existing WITH and OFFSET keywords, adding ORDINALITY keyword.

Author: David Hayes

src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java

@@ -109,6 +109,7 @@ public class ParserKeywordsUtils {
             {"OPTIMIZE", RESTRICTED_ALIAS},
             {"OR", RESTRICTED_SQL2016},
             {"ORDER", RESTRICTED_SQL2016},
+            {"ORDINALITY", RESTRICTED_SQL2016},
             {"OUTER", RESTRICTED_JSQLPARSER},
             {"OUTPUT", RESTRICTED_JSQLPARSER},
             {"OPTIMIZE ", RESTRICTED_JSQLPARSER},

src/main/java/net/sf/jsqlparser/statement/select/TableFunction.java

@@ -154,7 +154,7 @@ public StringBuilder appendTo(StringBuilder builder) {
         builder.append(function.toString());
 
         if (withClause != null) {
-            builder.append(" ").append(withClause);
+            builder.append(" WITH ").append(withClause);
         }
 
         if (alias != null) {

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

@@ -748,7 +748,7 @@ public <S> StringBuilder visit(TableFunction tableFunction, S context) {
         tableFunction.getFunction().accept(this.expressionVisitor, context);
 
         if (tableFunction.getWithClause() != null) {
-            builder.append(" ").append(tableFunction.getWithClause());
+            builder.append(" WITH ").append(tableFunction.getWithClause());
         }
 
         if (tableFunction.getAlias() != null) {

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">
@@ -545,8 +546,6 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_WHERE:"WHERE">
 |   <K_WINDOW:"WINDOW">
 |   <K_WITH:"WITH">
-|   <K_WITH_OFFSET:"WITH OFFSET">
-|   <K_WITH_ORDINALITY:"WITH ORDINALITY">
 |   <K_WITH_TIES:"WITH TIES">
 |   <K_WITHIN:"WITHIN">
 |   <K_WITHOUT:"WITHOUT">
@@ -6643,7 +6642,7 @@ TableFunction TableFunction():
 {
     [ prefix = <K_LATERAL> ]
     function=Function()
-    [ withClause = <K_WITH_OFFSET> | withClause = <K_WITH_ORDINALITY> ]
+    [ <K_WITH> ( withClause = <K_OFFSET> | withClause = <K_ORDINALITY> ) ]
     {
         return  prefix!=null
             ? withClause!=null

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

@@ -52,11 +52,11 @@ void testTableFunctionWithNamedParameterWhereNameIsOuterKeyword() throws JSQLPar
 
     @ParameterizedTest
     @ValueSource(strings = {
-            "WITH OFFSET",
-            "WITH ORDINALITY"
+            "OFFSET",
+            "ORDINALITY"
     })
     void testTableFunctionWithSupportedWithClauses(String withClause) throws JSQLParserException {
-        String sqlStr = "SELECT * FROM UNNEST(ARRAY[1, 2, 3]) " + withClause + " AS t(a, b)";
+        String sqlStr = "SELECT * FROM UNNEST(ARRAY[1, 2, 3]) WITH " + withClause + " AS t(a, b)";
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
 }