build: update Gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Wed Mar 13 14:27:42 ICT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/java/ai/starlake/transpiler/JSQLExpressionTranspiler.java

@@ -49,6 +49,7 @@
 import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
 import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
 import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.select.OrderByElement;
 import net.sf.jsqlparser.statement.select.ParenthesedSelect;
@@ -2199,7 +2200,34 @@ public void visit(Column column) {
         break;
       }
     }
-    super.visit(column);
+
+    // overwrite this completely because Array Constructor beginning with 1
+    Table table = column.getTable();
+    String tableName = null;
+    if (table != null) {
+      if (table.getAlias() != null) {
+        tableName = table.getAlias().getName();
+      } else {
+        tableName = table.getFullyQualifiedName();
+      }
+    }
+
+    if (tableName != null && !tableName.isEmpty()) {
+      buffer.append(tableName).append(column.getTableDelimiter());
+    }
+
+    buffer.append(column.getColumnName());
+    if (column.getArrayConstructor() != null) {
+      ArrayConstructor arrayConstructor = column.getArrayConstructor();
+
+      ExpressionList<Expression> expressions = (ExpressionList<Expression>) arrayConstructor.getExpressions();
+      for (int i=0; i<expressions.size(); i++) {
+        expressions.set(i, BinaryExpression.add(expressions.get(i), new LongValue(1) ));
+      }
+      arrayConstructor.setExpressions(expressions);
+
+      column.getArrayConstructor().accept(this);
+    }
   }
 
   public void visit(ExpressionList expressionList) {

src/main/java/ai/starlake/transpiler/databricks/DatabricksExpressionTranspiler.java

@@ -26,11 +26,13 @@
 import net.sf.jsqlparser.expression.CastExpression;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Function;
+import net.sf.jsqlparser.expression.LambdaExpression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.TimeKeyExpression;
 import net.sf.jsqlparser.expression.TimezoneExpression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
 import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
@@ -63,6 +65,8 @@ enum TranspiledFunction {
 
     , TRY_AVG, TRY_SUM, PERCENT_RANK
 
+    , ARRAY_APPEND, ARRAY_COMPACT
+
     ;
     // @FORMATTER:ON
 
@@ -514,9 +518,25 @@ public void visit(Function function) {
         case TRY_AVG:
           warning("TRY error handling not supported.");
           function.setName("Avg");
+          break;
         case TRY_SUM:
           warning("TRY error handling not supported.");
           function.setName("Sum");
+          break;
+        case ARRAY_APPEND:
+          if (paramCount==2) {
+            rewrittenExpression = BinaryExpression.concat(parameters.get(0), new ArrayConstructor(parameters.get(1)));
+          }
+          break;
+        case ARRAY_COMPACT:
+          if (paramCount==1) {
+            function.setName("List_Filter");
+            function.setParameters(
+                    parameters.get(0)
+                    , new LambdaExpression("x", new IsNullExpression("x", true))
+            );
+          }
+          break;
       }
     }
     if (rewrittenExpression == null) {

src/test/resources/ai/starlake/transpiler/databricks/array_function.sql

@@ -0,0 +1,69 @@
+-- provided
+SELECT a[2] AS e FROM VALUES(array(10, 20, 30)) AS T(a);
+
+-- expected
+SELECT a[2+1] AS e FROM VALUES([10, 20, 30]) AS T(a);
+
+-- result
+"e"
+"30"
+
+
+-- provided
+SELECT array(1, 2, 3)  AS arr;
+
+-- expected
+SELECT [1, 2, 3] AS arr;
+
+-- result
+"arr"
+"[1, 2, 3]"
+
+
+-- provided
+SELECT array_append(array(1, 2, 3), 0) AS arr;
+
+-- expected
+SELECT [1, 2, 3] || [0] AS arr;
+
+-- result
+"arr"
+"[1, 2, 3, 0]"
+
+
+-- provided
+SELECT array_compact(array(1, 2, NULL, 3, NULL, 3)) AS arr;
+
+-- expected
+SELECT list_filter([1, 2, NULL, 3, NULL, 3], x -> x IS NOT NULL) AS arr;
+
+-- result
+"arr"
+"[1, 2, 3, 3]"
+
+
+-- provided
+SELECT array_contains([1, 2, 3], 2) AS b;
+
+-- result
+"b"
+"true"
+
+
+-- provided
+SELECT array_distinct([1, 2, 3, NULL, 3]) AS arr;
+
+-- result
+"arr"
+"[3, 2, 1]"
+
+
+-- provided
+SELECT array_except([1, 2, 2, 3], [1, 1, 3, 5]) AS arr;
+
+-- expected
+SELECT list_distinct(list_filter([1, 2, 2, 3], x -> NOT array_contains(list_intersect([1, 2, 2, 3], [1, 1, 3, 5]), x) )) AS arr;
+
+-- result
+"arr"
+"[2]"