feat: DateUnitExpression for parsing HOUR, DAY, MONTH etc. in Date Functions not as column

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

.github/workflows/ci.yml

@@ -39,7 +39,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+#       currently Windows does not work w/ code page related issues
+#       os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-latest ]
     steps:
       - uses: actions/checkout@main
         with:
@@ -57,7 +59,7 @@ jobs:
   gradle_publish:
     name: Gradle Publish
     needs: [ gradle_check, maven_verify ]  # ✅ Run only after both succeed
-    if: github.ref == 'refs/heads/master' && github.repository == 'YOUR-ORG/YOUR-REPO'  # ✅ Only for master branch of main repo
+    if: github.ref == 'refs/heads/master' && github.repository == 'JSQLParser/JSqlParser'  # ✅ Only for master branch of main repo
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main

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

@@ -0,0 +1,50 @@
+/*-
+ * #%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 net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+import java.util.Objects;
+
+public class DateUnitExpression extends ASTNodeAccessImpl implements Expression {
+
+    private final DateUnit type;
+
+    public DateUnitExpression(DateUnit type) {
+        this.type = Objects.requireNonNull(type);
+    }
+
+    public DateUnitExpression(String DateUnitStr) {
+        this.type = Objects.requireNonNull(DateUnit.from(DateUnitStr));
+    }
+
+    public DateUnit getType() {
+        return type;
+    }
+
+
+    @Override
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
+        return expressionVisitor.visit(this, context);
+    }
+
+    @Override
+    public String toString() {
+        return type.toString();
+    }
+
+    public enum DateUnit {
+        CENTURY, DECADE, YEAR, QUARTER, MONTH, WEEK, DAY, HOUR, MINUTE, SECOND, MILLISECOND, MICROSECOND, NANOSECOND;
+
+        public static DateUnit from(String UnitStr) {
+            return Enum.valueOf(DateUnit.class, UnitStr.toUpperCase());
+        }
+    }
+}

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

@@ -779,4 +779,6 @@ default void visit(Inverse inverse) {
     <S> T visit(CosineSimilarity cosineSimilarity, S context);
 
     <S> T visit(FromQuery fromQuery, S context);
+
+    <S> T visit(DateUnitExpression dateUnitExpression, S context);
 }

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

@@ -840,4 +840,9 @@ public <S> T visit(FromQuery fromQuery, S context) {
         return null;
     }
 
+    @Override
+    public <S> T visit(DateUnitExpression dateUnitExpression, S context) {
+        return null;
+    }
+
 }

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

@@ -829,6 +829,11 @@ public <S> Void visit(FromQuery fromQuery, S context) {
         return null;
     }
 
+    @Override
+    public <S> Void visit(DateUnitExpression dateUnitExpression, S context) {
+        return null;
+    }
+
     /**
      * Initializes table names collector. Important is the usage of Column instances to find table
      * names. This is only allowed for expression parsing, where a better place for tablenames could

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

@@ -23,6 +23,7 @@
 import net.sf.jsqlparser.expression.ConnectByRootOperator;
 import net.sf.jsqlparser.expression.ConnectByPriorOperator;
 import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
+import net.sf.jsqlparser.expression.DateUnitExpression;
 import net.sf.jsqlparser.expression.DateValue;
 import net.sf.jsqlparser.expression.DoubleValue;
 import net.sf.jsqlparser.expression.Expression;
@@ -1829,4 +1830,9 @@ public <S> StringBuilder visit(CosineSimilarity cosineSimilarity, S context) {
     public <S> StringBuilder visit(FromQuery fromQuery, S context) {
         return null;
     }
+
+    @Override
+    public <S> StringBuilder visit(DateUnitExpression dateUnitExpression, S context) {
+        return builder.append(dateUnitExpression.toString());
+    }
 }

src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java

@@ -22,6 +22,7 @@
 import net.sf.jsqlparser.expression.ConnectByRootOperator;
 import net.sf.jsqlparser.expression.ConnectByPriorOperator;
 import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
+import net.sf.jsqlparser.expression.DateUnitExpression;
 import net.sf.jsqlparser.expression.DateValue;
 import net.sf.jsqlparser.expression.DoubleValue;
 import net.sf.jsqlparser.expression.Expression;
@@ -1314,4 +1315,9 @@ public <S> Void visit(FromQuery fromQuery, S context) {
         return null;
     }
 
+    @Override
+    public <S> Void visit(DateUnitExpression dateUnitExpression, S context) {
+        return null;
+    }
+
 }

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

@@ -6559,9 +6559,11 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | LOOKAHEAD(3, { !interrupted}) retval = FullTextSearch()
 
-        | LOOKAHEAD(2, {!interrupted}) retval=CastExpression()
+        | LOOKAHEAD(2, {!interrupted}) retval= CastExpression()
 
-        | LOOKAHEAD(16) retval=Function() [ LOOKAHEAD(2) retval = AnalyticExpression( (Function) retval ) ]
+        | LOOKAHEAD(16) retval = Function() [ LOOKAHEAD(2) retval = AnalyticExpression( (Function) retval ) ]
+
+        | LOOKAHEAD(2) retval = DateUnitExpression()
 
         | LOOKAHEAD(2, {!interrupted}) retval = IntervalExpression() { dateExpressionAllowed = false; }
 
@@ -6804,10 +6806,25 @@ NumericBind NumericBind() : {
 DateTimeLiteralExpression DateTimeLiteralExpression() : {
     DateTimeLiteralExpression expr = new DateTimeLiteralExpression();
     Token t;
-} {
-    t=<K_DATETIMELITERAL>  { expr.setType(DateTimeLiteralExpression.DateTime.from(t.image)); }
+}
+{
+    t=<K_DATETIMELITERAL>
+    {
+        expr.setType(DateTimeLiteralExpression.DateTime.from(t.image));
+    }
 
-    ( t=<S_CHAR_LITERAL> | t=<S_QUOTED_IDENTIFIER> ) { expr.setValue(t.image); return expr; }
+    ( t=<S_CHAR_LITERAL> | t=<S_QUOTED_IDENTIFIER> )
+    {
+        expr.setValue(t.image);
+        return expr;
+    }
+}
+
+DateUnitExpression DateUnitExpression() : {
+    Token t;
+}
+{
+    t=<K_DATE_LITERAL>  { return new DateUnitExpression( t.image ); }
 }
 
 RangeExpression RangeExpression(Expression startExpression):
@@ -6892,7 +6909,7 @@ StructType StructType() #StruckType:
         LOOKAHEAD(4) (
             tk1=<K_STRUCT> { keyword = tk1.image; }
             "<" parameters = StructParameters() ">"
-            "(" { System.out.println("found arguments!"); }  arguments = SelectItemsList() ")"
+            "(" arguments = SelectItemsList() ")"
         )
         |
         (
@@ -6916,10 +6933,6 @@ StructType StructType() #StruckType:
                 LOOKAHEAD(2) "::" <K_STRUCT> "(" parameters = StructParameters() ")"
             )*
         )
-
-        // don't parse this as an Struct, but rather use an Expressionlist
-        // |
-        // arguments = StructArguments()
     )
     {
         type = new StructType(dialect, keyword, parameters, arguments);
@@ -7703,7 +7716,7 @@ Function SpecialStringFunctionWithNamedParameters() :
 
         "("
         (
-            LOOKAHEAD(6, { getAsBoolean(Feature.allowComplexParsing) }) namedExpressionList = NamedExpressionListExprFirst()
+            LOOKAHEAD( NamedExpressionListExprFirst() , { getAsBoolean(Feature.allowComplexParsing) }) namedExpressionList = NamedExpressionListExprFirst()
             |
             expressionList=ExpressionList()
         )

src/test/java/net/sf/jsqlparser/expression/DateUnitExpressionTest.java

@@ -0,0 +1,21 @@
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.test.TestUtils;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+
+class DateUnitExpressionTest {
+
+    @Test
+    void testParsing() throws JSQLParserException {
+        String sqlStr = "SELECT Last_Day( DATE '2024-12-31', month ) as month";
+
+        PlainSelect select = (PlainSelect) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+
+        Function f = select.getSelectItem(0).getExpression(Function.class);
+        Assertions.assertThat(f.getParameters().get(1)).isInstanceOf(DateUnitExpression.class);
+    }
+}

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

@@ -6422,4 +6422,16 @@ void testSQL2016CorrespondingBy() throws JSQLParserException {
 
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
+
+    @Test
+    void testIssue2332SubStrCTE() throws JSQLParserException {
+        String sqlStr =
+                "create table t as\n" +
+                        "  with\n" +
+                        "    _ as (select f(id = '') from v)\n" +
+                        "  select\n" +
+                        "    substring (f (u.id))\n" +
+                        "  from u ;";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
 }