fix(deps): update dependency sqlglot to >=23.4,<25.10

.env

@@ -1,4 +1,4 @@
-FLINK_VERSION=1.19.0
+FLINK_VERSION=1.19.1
 CLOUDSDK_ACTIVE_CONFIG_NAME=ibis-gbq
 GOOGLE_CLOUD_PROJECT="$CLOUDSDK_ACTIVE_CONFIG_NAME"
 PGPASSWORD="postgres"

.github/workflows/ibis-backends.yml

@@ -227,8 +227,8 @@ jobs:
             extras:
               - flink
             additional_deps:
-              - "'apache-flink < 1.20.0'"
-              - "'pandas < 2.2'"
+              - "apache-flink@1.19.1"
+              - "'pandas<2.2'"
               - setuptools
             services:
               - flink
@@ -249,8 +249,8 @@ jobs:
               extras:
                 - flink
               additional_deps:
-                - "'apache-flink < 1.20.0'"
-                - "'pandas < 2.2'"
+                - "apache-flink@1.19.1"
+                - "'pandas<2.2'"
                 - setuptools
               services:
                 - flink
@@ -400,8 +400,8 @@ jobs:
               extras:
                 - flink
               additional_deps:
-                - "'apache-flink < 1.20.0'"
-                - "'pandas < 2.2'"
+                - "apache-flink@1.19.1"
+                - "'pandas<2.2'"
                 - setuptools
               services:
                 - flink
@@ -413,8 +413,8 @@ jobs:
               extras:
                 - flink
               additional_deps:
-                - "'apache-flink < 1.20.0'"
-                - "'pandas < 2.2'"
+                - "apache-flink@1.19.1"
+                - "'pandas<2.2'"
                 - setuptools
               services:
                 - flink

conda/environment-arm64-flink.yml

@@ -96,4 +96,4 @@ dependencies:
   - py4j =0.10.9.7
   - pip
   - pip:
-      - apache-flink >=1.19.1
+      - apache-flink =1.19.1

docker/flink/Dockerfile

@@ -1,4 +1,4 @@
-ARG FLINK_VERSION=1.20.0
+ARG FLINK_VERSION=1.19.1
 FROM flink:${FLINK_VERSION}
 
 # ibis-flink requires PyFlink dependency

ibis/backends/sql/dialects.py

@@ -5,6 +5,7 @@
 from copy import deepcopy
 
 import sqlglot.expressions as sge
+import sqlglot.generator as sgn
 from sqlglot import transforms
 from sqlglot.dialects import (
     TSQL,
@@ -219,6 +220,16 @@ class Generator(Hive.Generator):
             sge.Interval: _interval_with_precision,
         }
 
+        # Flink is like Hive except where it might actually be convenient
+        #
+        # UNNEST works like the SQL standard, and not like Hive, so we have to
+        # override sqlglot here and convince it that flink is not like Hive
+        # when it comes to unnesting
+        TRANSFORMS.pop(sge.Unnest, None)
+
+        def unnest_sql(self, expression: sge.Unnest) -> str:
+            return sgn.Generator.unnest_sql(self, expression)
+
         def struct_sql(self, expression: sge.Struct) -> str:
             from sqlglot.optimizer.annotate_types import annotate_types
 

pyproject.toml

@@ -46,7 +46,7 @@ pyarrow-hotfix = { version = ">=0.4,<1", optional = true }
 python-dateutil = ">=2.8.2,<3"
 pytz = ">=2022.7"
 rich = ">=12.4.4,<14"
-sqlglot = ">=23.4,<25.9"
+sqlglot = ">=23.4,<25.10"
 toolz = ">=0.11,<1"
 typing-extensions = ">=4.3.0,<5"
 black = { version = ">=22.1.0,<25", optional = true }

requirements-dev.txt

@@ -256,7 +256,7 @@ sortedcontainers==2.4.0 ; python_version >= "3.10" and python_version < "4.0"
 soupsieve==2.5 ; python_version >= "3.10" and python_version < "3.13"
 sphobjinv==2.3.1.1 ; python_version >= "3.10" and python_version < "3.13"
 sqlalchemy==2.0.31 ; python_version >= "3.10" and python_version < "3.13"
-sqlglot==25.8.1 ; python_version >= "3.10" and python_version < "4.0"
+sqlglot==25.9.0 ; python_version >= "3.10" and python_version < "4.0"
 stack-data==0.6.3 ; python_version >= "3.10" and python_version < "4.0"
 statsmodels==0.14.2 ; python_version >= "3.10" and python_version < "3.13"
 tabulate==0.9.0 ; python_version >= "3.10" and python_version < "3.13"