sqlframe 3.22.1__py3-none-any.whl → 3.23.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.22.1'
-__version_tuple__ = version_tuple = (3, 22, 1)
+__version__ = version = '3.23.0'
+__version_tuple__ = version_tuple = (3, 23, 0)

sqlframe/base/functions.py

@@ -856,15 +856,21 @@ def expr(str: str) -> Column:
 
 @meta(unsupported_engines=["postgres"])
 def struct(col: t.Union[ColumnOrName, t.Iterable[ColumnOrName]], *cols: ColumnOrName) -> Column:
-    from sqlframe.base.function_alternatives import struct_with_eq
-
     session = _get_session()
-
-    if session._is_snowflake:
-        return struct_with_eq(col, *cols)
-
-    columns = ensure_list(col) + list(cols)
-    return Column.invoke_expression_over_column(None, expression.Struct, expressions=columns)
+    col_func = get_func_from_session("col")
+
+    columns = [col_func(x) for x in ensure_list(col) + list(cols)]
+    expressions = []
+    for column in columns:
+        expressions.append(
+            expression.PropertyEQ(
+                this=expression.parse_identifier(
+                    column.alias_or_name, dialect=session.input_dialect
+                ),
+                expression=column.column_expression,
+            )
+        )
+    return Column(expression.Struct(expressions=expressions))
 
 
 @meta(unsupported_engines=["bigquery", "duckdb", "postgres", "snowflake"])

{sqlframe-3.22.1.dist-info → sqlframe-3.23.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.22.1
+Version: 3.23.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 <26.7,>=24.0.0
+Requires-Dist: sqlglot <26.9,>=24.0.0
 Requires-Dist: typing-extensions
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery-storage <3,>=2 ; extra == 'bigquery'
@@ -25,7 +25,7 @@ Requires-Dist: google-cloud-bigquery[pandas] <4,>=3 ; extra == 'bigquery'
 Provides-Extra: databricks
 Requires-Dist: databricks-sql-connector <5,>=3.6 ; extra == 'databricks'
 Provides-Extra: dev
-Requires-Dist: duckdb <1.2,>=0.9 ; extra == 'dev'
+Requires-Dist: duckdb <1.3,>=1.2 ; extra == 'dev'
 Requires-Dist: findspark <3,>=2 ; extra == 'dev'
 Requires-Dist: mypy <1.16,>=1.10.0 ; extra == 'dev'
 Requires-Dist: openai <2,>=1.30 ; extra == 'dev'
@@ -48,7 +48,7 @@ Requires-Dist: mkdocs-material ==9.0.5 ; extra == 'docs'
 Requires-Dist: mkdocs ==1.4.2 ; extra == 'docs'
 Requires-Dist: pymdown-extensions ; extra == 'docs'
 Provides-Extra: duckdb
-Requires-Dist: duckdb <1.2,>=0.9 ; extra == 'duckdb'
+Requires-Dist: duckdb <1.3,>=1.2 ; extra == 'duckdb'
 Requires-Dist: pandas <3,>=2 ; extra == 'duckdb'
 Provides-Extra: openai
 Requires-Dist: openai <2,>=1.30 ; extra == 'openai'
@@ -59,7 +59,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.14,>=3.10.0 ; extra == 'snowflake'
+Requires-Dist: snowflake-connector-python[secure-local-storage] <3.15,>=3.10.0 ; extra == 'snowflake'
 Provides-Extra: spark
 Requires-Dist: pyspark <3.6,>=2 ; extra == 'spark'
 

{sqlframe-3.22.1.dist-info → sqlframe-3.23.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlframe/__init__.py,sha256=wfqm98eLoLid9oV_FzzpG5loKC6LxOhj2lXpfN7SARo,3138
-sqlframe/_version.py,sha256=8eLhLry2PxnXZDWV0RoPCF5YsBcUB10-ky6GKcZbQZU,513
+sqlframe/_version.py,sha256=LBEtYNWSnG3GH8sBUqzbBkvKuUnJ78uz2Pmt2SqvhMY,513
 sqlframe/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlframe/base/_typing.py,sha256=b2clI5HI1zEZKB_3Msx3FeAJQyft44ubUifJwQRVXyQ,1298
 sqlframe/base/catalog.py,sha256=D39Mn4AIkUyaVyLJiI5gcX0Bv_pChl89GAyYHrtOw5g,38513
@@ -8,7 +8,7 @@ sqlframe/base/dataframe.py,sha256=9wcN5I5bSiGKs6m-mSCwlDUSRfrZ_ymfRUtJa8hggd4,83
 sqlframe/base/decorators.py,sha256=ms-CvDOIW3T8IVB9VqDmLwAiaEsqXLYRXEqVQaxktiM,1890
 sqlframe/base/exceptions.py,sha256=9Uwvqn2eAkDpqm4BrRgbL61qM-GMCbJEMAW8otxO46s,370
 sqlframe/base/function_alternatives.py,sha256=KFkEm0aIHzajvQmiPZnzTLh-Ud9wjeg4lJ4Rk0vk-YU,53674
-sqlframe/base/functions.py,sha256=0lLefa959J1z7Ea6QBnQrru06lKCLurEX1xFYxGJbTc,223082
+sqlframe/base/functions.py,sha256=gWUxngV4cgbPvKqK7_N-2rYGycRyoKJnZqPfFyqIgbE,223305
 sqlframe/base/group.py,sha256=fsyG5990_Pd7gFPjTFrH9IEoAquL_wEkVpIlBAIkZJU,4091
 sqlframe/base/normalize.py,sha256=nXAJ5CwxVf4DV0GsH-q1w0p8gmjSMlv96k_ez1eVul8,3880
 sqlframe/base/operations.py,sha256=xSPw74e59wYvNd6U1AlwziNCTG6Aftrbl4SybN9u9VE,3450
@@ -129,8 +129,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.22.1.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-3.22.1.dist-info/METADATA,sha256=T51BFHOahh25l4U0bR07BvwoXMIyO_FvhzwJYA54-sQ,8970
-sqlframe-3.22.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sqlframe-3.22.1.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-3.22.1.dist-info/RECORD,,
+sqlframe-3.23.0.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-3.23.0.dist-info/METADATA,sha256=li6TMha72t0_876a0_gTA6ckfhiYptkeNrTtZL4c4M0,8970
+sqlframe-3.23.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sqlframe-3.23.0.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-3.23.0.dist-info/RECORD,,