feat: Databricks IGNORE/RESPECT NULLS

- IGNORE/RESPECT NULLS for aggregate functions
- `VALUES` can have an `Alias`

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>

Author: manticore-projects

settings.gradle

@@ -2,4 +2,4 @@
  * This file was generated by the Gradle 'init' task.
  */
 
-rootProject.name = 'jsqlparser'
+rootProject.name = 'JSQLFormatter'

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

@@ -75,6 +75,7 @@ public AnalyticExpression(Function function) {
             }
         }
         this.havingClause = function.getHavingClause();
+        this.ignoreNullsOutside = function.isIgnoreNullsOutside();
         this.nullHandling = function.getNullHandling();
         this.funcOrderBy = function.getOrderByElements();
         this.limit = function.getLimit();

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

@@ -86,6 +86,7 @@ public String toString() {
     private Column attributeColumn = null;
     private List<OrderByElement> orderByElements;
     private NullHandling nullHandling = null;
+    private boolean ignoreNullsOutside = false; // IGNORE NULLS outside function parameters
     private Limit limit = null;
 
     private KeepExpression keep = null;
@@ -148,6 +149,15 @@ public Function setNullHandling(NullHandling nullHandling) {
         return this;
     }
 
+    public boolean isIgnoreNullsOutside() {
+        return ignoreNullsOutside;
+    }
+
+    public Function setIgnoreNullsOutside(boolean ignoreNullsOutside) {
+        this.ignoreNullsOutside = ignoreNullsOutside;
+        return this;
+    }
+
     public Limit getLimit() {
         return limit;
     }
@@ -321,7 +331,7 @@ public String toString() {
                     havingClause.appendTo(b);
                 }
 
-                if (nullHandling != null) {
+                if (nullHandling != null && !isIgnoreNullsOutside()) {
                     switch (nullHandling) {
                         case IGNORE_NULLS:
                             b.append(" IGNORE NULLS");
@@ -357,6 +367,17 @@ public String toString() {
 
         String ans = getName() + params;
 
+        if (nullHandling != null && isIgnoreNullsOutside()) {
+            switch (nullHandling) {
+                case IGNORE_NULLS:
+                    ans += " IGNORE NULLS";
+                    break;
+                case RESPECT_NULLS:
+                    ans += " RESPECT NULLS";
+                    break;
+            }
+        }
+
         if (attributeExpression != null) {
             ans += "." + attributeExpression;
         } else if (attributeColumn != null) {

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

@@ -20,15 +20,21 @@
 public class Values extends Select implements FromItem {
 
     private ExpressionList<Expression> expressions;
+    private Alias alias;
 
     public Values() {
-        // empty constructor
+        this(null, null);
     }
 
     public Values(ExpressionList<Expression> expressions) {
         this.expressions = expressions;
     }
 
+    public Values(ExpressionList<Expression> expressions, Alias alias) {
+        this.expressions = expressions;
+        this.alias = alias;
+    }
+
     public ExpressionList<?> getExpressions() {
         return expressions;
     }
@@ -42,6 +48,9 @@ public void setExpressions(ExpressionList<Expression> expressions) {
     public StringBuilder appendSelectBodyTo(StringBuilder builder) {
         builder.append("VALUES ");
         builder.append(expressions.toString());
+        if (alias != null) {
+            builder.append(" ").append(alias);
+        }
         return builder;
     }
 
@@ -74,12 +83,12 @@ public void accept(FromItemVisitor fromItemVisitor) {
 
     @Override
     public Alias getAlias() {
-        return null;
+        return alias;
     }
 
     @Override
     public void setAlias(Alias alias) {
-
+        this.alias = alias;
     }
 
     @Override

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

@@ -613,7 +613,7 @@ public void visit(Function function) {
                 havingClause.getExpression().accept(this);
             }
 
-            if (function.getNullHandling() != null) {
+            if (function.getNullHandling() != null && !function.isIgnoreNullsOutside()) {
                 switch (function.getNullHandling()) {
                     case IGNORE_NULLS:
                         buffer.append(" IGNORE NULLS");
@@ -643,6 +643,17 @@ public void visit(Function function) {
             buffer.append(")");
         }
 
+        if (function.getNullHandling() != null && function.isIgnoreNullsOutside()) {
+            switch (function.getNullHandling()) {
+                case IGNORE_NULLS:
+                    buffer.append(" IGNORE NULLS");
+                    break;
+                case RESPECT_NULLS:
+                    buffer.append(" RESPECT NULLS");
+                    break;
+            }
+        }
+
         if (function.getAttribute() != null) {
             buffer.append(".").append(function.getAttribute());
         }

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

@@ -25,5 +25,8 @@ public ValuesStatementDeParser(ExpressionVisitor expressionVisitor, StringBuilde
     public void deParse(Values values) {
         buffer.append("VALUES ");
         values.getExpressions().accept(expressionVisitor);
+        if (values.getAlias() != null) {
+            buffer.append(" ").append(values.getAlias());
+        }
     }
 }

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

@@ -5086,16 +5086,6 @@ void windowFun(AnalyticExpression retval):{
      WindowDefinition winDef;
 } {
     (
-        [
-            (
-                <K_IGNORE> <K_NULLS> { retval.setNullHandling(Function.NullHandling.IGNORE_NULLS); retval.setIgnoreNullsOutside(true); }
-            )
-            |
-            (
-                 <K_RESPECT> <K_NULLS> {  retval.setNullHandling(Function.NullHandling.RESPECT_NULLS); retval.setIgnoreNullsOutside(true); }
-            )
-        ]
-
         <K_OVER> {retval.setType(AnalyticType.OVER);}
         |
         <K_WITHIN> <K_GROUP> {retval.setType(AnalyticType.WITHIN_GROUP);}
@@ -5146,8 +5136,13 @@ AnalyticExpression AnalyticExpression(Function function) :
     Expression filter = null;
 }
 {
-    ((<K_FILTER> "(" <K_WHERE> {retval.setType(AnalyticType.FILTER_ONLY);} filter = Expression() ")" [ LOOKAHEAD(2) windowFun(retval) ] )
-        | windowFun(retval))
+    (
+        (
+            <K_FILTER> "(" <K_WHERE> {retval.setType(AnalyticType.FILTER_ONLY);} filter = Expression() ")"
+            [ LOOKAHEAD(2) windowFun(retval) ]
+        )
+        | windowFun(retval)
+    )
     {
         retval.setFilterExpression(filter);
         return retval;
@@ -5610,6 +5605,7 @@ Function InternalFunction(boolean escaped):
 
     ")"
 
+
     [ "." (
             // tricky lookahead since we do need to support the following constructs
             // schema.f1().f2() - Function with Function Column
@@ -5620,6 +5616,24 @@ Function InternalFunction(boolean escaped):
           )
     ]
 
+    [
+        (
+            <K_IGNORE> <K_NULLS>
+            {
+                retval.setNullHandling(Function.NullHandling.IGNORE_NULLS);
+                retval.setIgnoreNullsOutside(true);
+            }
+        )
+        |
+        (
+             <K_RESPECT> <K_NULLS>
+             {
+                retval.setNullHandling(Function.NullHandling.RESPECT_NULLS);
+                retval.setIgnoreNullsOutside(true);
+             }
+        )
+    ]
+
     [ LOOKAHEAD(2) keep = KeepExpression() ]
 
     {

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

@@ -32,4 +32,15 @@ void testRedshiftApproximate() throws JSQLParserException {
 
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
+
+    @Test
+    void testDatabricks() throws JSQLParserException {
+        String sqlStr = "SELECT any_value(col) IGNORE NULLS FROM test;";
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+
+        sqlStr = "SELECT any_value(col) IGNORE NULLS FROM VALUES (NULL), (5), (20) AS tab(col);";
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
 }

src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/analytic_query04.sql

@@ -14,4 +14,5 @@ select deptno
 from emp
 
 --@FAILURE: Encountered unexpected token: "by" "BY" recorded first on Aug 3, 2021, 7:20:08 AM
---@SUCCESSFULLY_PARSED_AND_DEPARSED first on Nov 14, 2022, 11:44:23 AM
+--@SUCCESSFULLY_PARSED_AND_DEPARSED first on Nov 14, 2022, 11:44:23 AM
+--@FAILURE: Encountered unexpected token: "group" "GROUP" recorded first on May 27, 2024, 9:38:25 AM

src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/analytic_query05.sql

@@ -26,4 +26,5 @@
 
 
 --@FAILURE: Encountered unexpected token: "by" "BY" recorded first on Aug 3, 2021, 7:20:08 AM
---@SUCCESSFULLY_PARSED_AND_DEPARSED first on Nov 14, 2022, 11:44:22 AM
+--@SUCCESSFULLY_PARSED_AND_DEPARSED first on Nov 14, 2022, 11:44:22 AM
+--@FAILURE: Encountered unexpected token: "(" "(" recorded first on May 27, 2024, 9:38:28 AM