sqlframe 3.38.1__py3-none-any.whl → 3.39.0__py3-none-any.whl

sqlframe/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.38.1'
-__version_tuple__ = version_tuple = (3, 38, 1)
+__version__ = version = '3.39.0'
+__version_tuple__ = version_tuple = (3, 39, 0)

sqlframe/base/functions.py

@@ -2318,6 +2318,14 @@ def array_distinct(col: ColumnOrName) -> Column:
     if session._is_bigquery:
         return array_distinct_bgutil(col)
 
+    if session._is_duckdb:
+        # DuckDB's array_distinct removes nulls, but we need to preserve them
+        # Check if original array contains null and append it back if needed
+        original_col = Column.ensure_col(col)
+        distinct_result = Column.invoke_anonymous_function(col, "ARRAY_DISTINCT")
+        has_null = array_position(original_col, lit(None)) > lit(0)
+        return when(has_null, array_append(distinct_result, lit(None))).otherwise(distinct_result)
+
     return Column.invoke_anonymous_function(col, "ARRAY_DISTINCT")
 
 
@@ -2564,7 +2572,7 @@ def shuffle(col: ColumnOrName) -> Column:
 
 @meta(unsupported_engines="snowflake")
 def reverse(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "REVERSE")
+    return Column.invoke_expression_over_column(col, expression.Reverse)
 
 
 @meta(unsupported_engines=["bigquery", "postgres"])
@@ -3211,9 +3219,9 @@ def current_user() -> Column:
     return Column.invoke_expression_over_column(None, expression.CurrentUser)
 
 
-@meta(unsupported_engines="*")
+@meta()
 def date_from_unix_date(days: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(days, "date_from_unix_date")
+    return Column.invoke_expression_over_column(days, expression.DateFromUnixDate)
 
 
 @meta(unsupported_engines="*")
@@ -6623,7 +6631,7 @@ def unix_micros(col: ColumnOrName) -> Column:
 
     col = to_timestamp(col)
 
-    return Column.invoke_anonymous_function(col, "unix_micros")
+    return Column.invoke_expression_over_column(col, expression.UnixMicros)
 
 
 @meta()
@@ -6643,15 +6651,10 @@ def unix_millis(col: ColumnOrName) -> Column:
     """
     from sqlframe.base.function_alternatives import unix_millis_multiply_epoch
 
-    if (
-        _get_session()._is_bigquery
-        or _get_session()._is_duckdb
-        or _get_session()._is_postgres
-        or _get_session()._is_snowflake
-    ):
+    if _get_session()._is_duckdb or _get_session()._is_postgres or _get_session()._is_snowflake:
         return unix_millis_multiply_epoch(col)
 
-    return Column.invoke_anonymous_function(col, "unix_millis")
+    return Column.invoke_expression_over_column(col, expression.UnixMillis)
 
 
 @meta()

sqlframe/base/session.py

@@ -12,7 +12,6 @@ from collections import defaultdict
 from functools import cached_property
 
 import sqlglot
-from dateutil.relativedelta import relativedelta
 from sqlglot import Dialect, exp
 from sqlglot.dialects.dialect import DialectType, NormalizationStrategy
 from sqlglot.expressions import parse_identifier
@@ -34,6 +33,7 @@ from sqlframe.base.table import _BaseTable
 from sqlframe.base.udf import _BaseUDFRegistration
 from sqlframe.base.util import (
     get_column_mapping_from_schema_input,
+    is_relativedelta_like,
     normalize_string,
     verify_pandas_installed,
 )
@@ -614,7 +614,7 @@ class _BaseSession(t.Generic[CATALOG, READER, WRITER, DF, TABLE, CONN, UDF_REGIS
             return [cls._to_value(x) for x in value]
         elif isinstance(value, datetime.datetime):
             return value.replace(tzinfo=None)
-        elif isinstance(value, relativedelta):
+        elif is_relativedelta_like(value):
             return datetime.timedelta(
                 days=value.days, hours=value.hours, minutes=value.minutes, seconds=value.seconds
             )

sqlframe/base/util.py

@@ -524,3 +524,12 @@ def split_filepath(filepath: str) -> tuple[str, str]:
     if len(split_) == 2:  # noqa: PLR2004
         return split_[0] + "://", split_[1]
     return "", split_[0]
+
+
+def is_relativedelta_like(value: t.Any) -> bool:
+    return (
+        hasattr(value, "years")
+        and hasattr(value, "months")
+        and hasattr(value, "weeks")
+        and hasattr(value, "leapdays")
+    )

{sqlframe-3.38.1.dist-info → sqlframe-3.39.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.38.1
+Version: 3.39.0
 Summary: Turning PySpark Into a Universal DataFrame API
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman
@@ -17,7 +17,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: prettytable <4
-Requires-Dist: sqlglot <27.7,>=24.0.0
+Requires-Dist: sqlglot <27.8,>=24.0.0
 Requires-Dist: typing-extensions
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery-storage <3,>=2 ; extra == 'bigquery'
@@ -60,7 +60,7 @@ Requires-Dist: psycopg2 <3,>=2.8 ; extra == 'postgres'
 Provides-Extra: redshift
 Requires-Dist: redshift-connector <2.2.0,>=2.1.1 ; extra == 'redshift'
 Provides-Extra: snowflake
-Requires-Dist: snowflake-connector-python[secure-local-storage] <3.17,>=3.10.0 ; extra == 'snowflake'
+Requires-Dist: snowflake-connector-python[secure-local-storage] <3.18,>=3.10.0 ; extra == 'snowflake'
 Provides-Extra: spark
 Requires-Dist: pyspark <3.6,>=2 ; extra == 'spark'
 

{sqlframe-3.38.1.dist-info → sqlframe-3.39.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlframe/__init__.py,sha256=SB80yLTITBXHI2GCDS6n6bN5ObHqgPjfpRPAUwxaots,3403
-sqlframe/_version.py,sha256=W9hZ3tNnMUJ8fekpKqp7Li5vIlCbNYeYxErUGlSt3GI,513
+sqlframe/_version.py,sha256=D0S49ktdLOBGSUA4wMLJwNC0E4onYQxoqOk2Tlf1HW0,513
 sqlframe/py.typed,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 sqlframe/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlframe/base/_typing.py,sha256=b2clI5HI1zEZKB_3Msx3FeAJQyft44ubUifJwQRVXyQ,1298
@@ -9,17 +9,17 @@ sqlframe/base/dataframe.py,sha256=0diYONDlet8iZt49LC3vcmfXHAAZ2MovPL2pTXYHj2U,85
 sqlframe/base/decorators.py,sha256=IhE5xNQDkwJHacCvulq5WpUKyKmXm7dL2A3o5WuKGP4,2131
 sqlframe/base/exceptions.py,sha256=9Uwvqn2eAkDpqm4BrRgbL61qM-GMCbJEMAW8otxO46s,370
 sqlframe/base/function_alternatives.py,sha256=aTu3nQhIAkZoxrI1IpjpaHEAMxBNms0AnhS0EMR-TwY,51727
-sqlframe/base/functions.py,sha256=OVEUYh2ZCdgxeNgfCwVcvrt0fJvxCzz1YrdhR-71Ujo,227199
+sqlframe/base/functions.py,sha256=Hd77xVVOBeD4wr08OeCwFJa89LHAZHsMjZXl3cg_RQs,227630
 sqlframe/base/group.py,sha256=fBm8EUve7W7xz11nybTXr09ih-yZxL_vvEiZVE1eb_0,12025
 sqlframe/base/normalize.py,sha256=nXAJ5CwxVf4DV0GsH-q1w0p8gmjSMlv96k_ez1eVul8,3880
 sqlframe/base/operations.py,sha256=g-YNcbvNKTOBbYm23GKfB3fmydlR7ZZDAuZUtXIHtzw,4438
 sqlframe/base/readerwriter.py,sha256=Nb2VJ_HBmLQp5mK8JhnFooZh2ydAaboCAFVPb-4MNX4,31241
-sqlframe/base/session.py,sha256=ExaGjY_lxkMi2WDwJ8wTd2uf7a2PjOOk9bx1ViEaAqA,27507
+sqlframe/base/session.py,sha256=8oaEgGbyctKKEaI0GW6k7Praku7nwx3YRYgAW3mZNk0,27481
 sqlframe/base/table.py,sha256=rCeh1W5SWbtEVfkLAUiexzrZwNgmZeptLEmLcM1ABkE,6961
 sqlframe/base/transforms.py,sha256=y0j3SGDz3XCmNGrvassk1S-owllUWfkHyMgZlY6SFO4,467
 sqlframe/base/types.py,sha256=OktuJ5f7tEogOW0oupI0RBlHfzZMmKh7zGLke9cwllo,12305
 sqlframe/base/udf.py,sha256=O6hMhBUy9NVv-mhJRtfFhXTIa_-Z8Y_FkmmuOHu0l90,1117
-sqlframe/base/util.py,sha256=gv_kRc3LxCuQy3t4dHFldV7elB8RU5PMqIN5-xSkWSo,19107
+sqlframe/base/util.py,sha256=bIzEQXiUNBLYSCGR4v8AtABu-a6LAK5kUH_lm01fVBs,19321
 sqlframe/base/window.py,sha256=7NaKDTlhun-95LEghukBCjFBwq0RHrPaajWQNCsLxok,4818
 sqlframe/base/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlframe/base/mixins/catalog_mixins.py,sha256=9fZGWToz9xMJSzUl1vsVtj6TH3TysP3fBCKJLnGUQzE,23353
@@ -130,8 +130,8 @@ sqlframe/standalone/udf.py,sha256=azmgtUjHNIPs0WMVNId05SHwiYn41MKVBhKXsQJ5dmY,27
 sqlframe/standalone/window.py,sha256=6GKPzuxeSapJakBaKBeT9VpED1ACdjggDv9JRILDyV0,35
 sqlframe/testing/__init__.py,sha256=VVCosQhitU74A3NnE52O4mNtGZONapuEXcc20QmSlnQ,132
 sqlframe/testing/utils.py,sha256=PFsGZpwNUE_4-g_f43_vstTqsK0AQ2lBneb5Eb6NkFo,13008
-sqlframe-3.38.1.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-3.38.1.dist-info/METADATA,sha256=s_1Cya3IVuV_0sIR5sDWIDIWiq-3GQ1x5qn1noMqmB8,9039
-sqlframe-3.38.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sqlframe-3.38.1.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-3.38.1.dist-info/RECORD,,
+sqlframe-3.39.0.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-3.39.0.dist-info/METADATA,sha256=JG-T37BOFNvgTz-fYiZa82Mwaj-lvFjF5EiL8_ClU7w,9039
+sqlframe-3.39.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sqlframe-3.39.0.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-3.39.0.dist-info/RECORD,,