sqlframe 3.36.2__py3-none-any.whl → 3.37.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.36.2'
-__version_tuple__ = version_tuple = (3, 36, 2)
+__version__ = version = '3.37.0'
+__version_tuple__ = version_tuple = (3, 37, 0)

sqlframe/base/functions.py

@@ -1475,6 +1475,32 @@ def timestamp_seconds(col: ColumnOrName) -> Column:
     return Column.invoke_expression_over_column(col, expression.UnixToTime)
 
 
+@meta()
+def timestamp_add(unit: str, quantity: ColumnOrName, ts: ColumnOrName) -> Column:
+    session = _get_session()
+
+    if session._is_duckdb or session._is_postgres:
+        quantity = lit(quantity) if isinstance(quantity, int) else quantity
+        if (
+            isinstance(quantity, Column)
+            and isinstance(quantity.expression, expression.Literal)
+            and quantity.expression.is_number
+            and int(quantity.expression.this) < 0
+        ):
+            # If quantity is a negative literal, we use DateSub
+            expr = expression.DateSub
+            quantity.expression.set("this", str(-int(quantity.expression.this)))
+        else:
+            expr = expression.DateAdd  # type: ignore
+        return Column.invoke_expression_over_column(
+            ts, expr, expression=quantity, unit=expression.Var(this=unit.upper())
+        )
+
+    return Column.invoke_expression_over_column(
+        ts, expression.TimestampAdd, expression=quantity, unit=expression.Var(this=unit.upper())
+    )
+
+
 @meta(unsupported_engines=["*", "spark"])
 def window(
     timeColumn: ColumnOrName,
@@ -2084,24 +2110,24 @@ def array_size(col: ColumnOrName) -> Column:
     return Column.invoke_expression_over_column(col, expression.ArraySize)
 
 
-@meta(unsupported_engines="*")
+@meta(unsupported_engines="snowflake")
 def bit_and(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "BIT_AND")
+    return Column.invoke_expression_over_column(col, expression.BitwiseAndAgg)
 
 
-@meta(unsupported_engines="*")
+@meta(unsupported_engines="snowflake")
 def bit_or(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "BIT_OR")
+    return Column.invoke_expression_over_column(col, expression.BitwiseOrAgg)
 
 
-@meta(unsupported_engines="*")
+@meta(unsupported_engines="snowflake")
 def bit_xor(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "BIT_XOR")
+    return Column.invoke_expression_over_column(col, expression.BitwiseXorAgg)
 
 
-@meta(unsupported_engines="*")
+@meta(unsupported_engines=["postgres", "snowflake"])
 def bit_count(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "BIT_COUNT")
+    return Column.invoke_expression_over_column(col, expression.BitwiseCountAgg)
 
 
 @meta(unsupported_engines="*")
@@ -3267,7 +3293,7 @@ def find_in_set(str: ColumnOrName, str_array: ColumnOrName) -> Column:
     return Column.invoke_anonymous_function(str, "find_in_set", str_array)
 
 
-@meta(unsupported_engines=["bigquery", "postgres", "snowflake"])
+@meta(unsupported_engines=["bigquery", "postgres"])
 def first_value(col: ColumnOrName, ignoreNulls: t.Optional[t.Union[bool, Column]] = None) -> Column:
     """Returns the first value of `col` for a group of rows. It will return the first non-null
     value it sees when `ignoreNulls` is set to true. If all values are null, then null is returned.
@@ -3933,7 +3959,7 @@ def json_object_keys(col: ColumnOrName) -> Column:
     return Column.invoke_anonymous_function(col, "json_object_keys")
 
 
-@meta(unsupported_engines=["bigquery", "postgres", "snowflake"])
+@meta(unsupported_engines="postgres")
 def last_value(col: ColumnOrName, ignoreNulls: t.Optional[t.Union[bool, Column]] = None) -> Column:
     """Returns the last value of `col` for a group of rows. It will return the last non-null
     value it sees when `ignoreNulls` is set to true. If all values are null, then null is returned.

sqlframe/base/types.py

@@ -42,7 +42,7 @@ class DataTypeWithLength(DataType):
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.length})"
 
-    def __str__(self) -> str:
+    def simpleString(self) -> str:
         return f"{self.typeName()}({self.length})"
 
 

{sqlframe-3.36.2.dist-info → sqlframe-3.37.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.36.2
+Version: 3.37.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.34,>=24.0.0
+Requires-Dist: sqlglot <27.2,>=24.0.0
 Requires-Dist: typing-extensions
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery-storage <3,>=2 ; extra == 'bigquery'
@@ -27,16 +27,17 @@ Requires-Dist: databricks-sql-connector[pyarrow] <5,>=3.6 ; extra == 'databricks
 Provides-Extra: dev
 Requires-Dist: duckdb <1.4,>=1.2 ; extra == 'dev'
 Requires-Dist: findspark <3,>=2 ; extra == 'dev'
-Requires-Dist: mypy <1.17,>=1.10.0 ; extra == 'dev'
+Requires-Dist: mypy <1.18,>=1.10.0 ; extra == 'dev'
 Requires-Dist: openai <2,>=1.30 ; extra == 'dev'
 Requires-Dist: pandas-stubs <3,>=2 ; extra == 'dev'
 Requires-Dist: pandas <3,>=2 ; extra == 'dev'
 Requires-Dist: pre-commit <5,>=3.7 ; extra == 'dev'
 Requires-Dist: psycopg <4,>=3.1 ; extra == 'dev'
-Requires-Dist: pyarrow <21,>=10 ; extra == 'dev'
+Requires-Dist: pyarrow <22,>=10 ; extra == 'dev'
 Requires-Dist: pyspark <3.6,>=2 ; extra == 'dev'
 Requires-Dist: pytest-forked ; extra == 'dev'
 Requires-Dist: pytest-postgresql <8,>=6 ; extra == 'dev'
+Requires-Dist: pytest-rerunfailures ; extra == 'dev'
 Requires-Dist: pytest-xdist <3.9,>=3.6 ; extra == 'dev'
 Requires-Dist: pytest <8.5,>=8.2.0 ; extra == 'dev'
 Requires-Dist: ruff <0.13,>=0.4.4 ; extra == 'dev'

{sqlframe-3.36.2.dist-info → sqlframe-3.37.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlframe/__init__.py,sha256=SB80yLTITBXHI2GCDS6n6bN5ObHqgPjfpRPAUwxaots,3403
-sqlframe/_version.py,sha256=8n9kfLZeiKlOVTLEVFfs0B2MLJQ8xc2SyKauUUuFT3s,513
+sqlframe/_version.py,sha256=OHLx0CdNTm07UdNGtUV9adqYt8IYPToP_wYMErxuyAQ,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,7 +9,7 @@ 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=n1MsfJt2WWUk7-YwbfByWG065g0W45AwJVIME5H-QJU,225875
+sqlframe/base/functions.py,sha256=OxoeI2cEoQY79hdOnvpw0pRiaUHkU55MMpfx7_v5l70,226984
 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
@@ -17,7 +17,7 @@ sqlframe/base/readerwriter.py,sha256=Nb2VJ_HBmLQp5mK8JhnFooZh2ydAaboCAFVPb-4MNX4
 sqlframe/base/session.py,sha256=djXPmuW0cIQYuoE7hegfyvZuKC2D3ABZCjvw-fa1C24,27260
 sqlframe/base/table.py,sha256=rCeh1W5SWbtEVfkLAUiexzrZwNgmZeptLEmLcM1ABkE,6961
 sqlframe/base/transforms.py,sha256=y0j3SGDz3XCmNGrvassk1S-owllUWfkHyMgZlY6SFO4,467
-sqlframe/base/types.py,sha256=0gebYkJUtaijaqBis2uqE3CRr3PfVTriwyUJ9-7ly_0,12300
+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/window.py,sha256=7NaKDTlhun-95LEghukBCjFBwq0RHrPaajWQNCsLxok,4818
@@ -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.36.2.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-3.36.2.dist-info/METADATA,sha256=G40goRUAdQg115DFuLq6-RYZ_6OSyBJ0zRsPHu7mhMQ,8987
-sqlframe-3.36.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sqlframe-3.36.2.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-3.36.2.dist-info/RECORD,,
+sqlframe-3.37.0.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-3.37.0.dist-info/METADATA,sha256=dr_LT2MGEsiXj-1rwsTtx31DtQxM6_Fo9zsJ24ghD30,9039
+sqlframe-3.37.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sqlframe-3.37.0.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-3.37.0.dist-info/RECORD,,