sqlframe 3.36.2__tar.gz → 3.36.3__tar.gz

{sqlframe-3.36.2 → sqlframe-3.36.3}/Makefile

@@ -11,7 +11,7 @@ fast-test:
 	pytest -n auto tests/unit
 
 local-test:
-	pytest -n auto -m "fast or local"
+	pytest -n auto -m "fast or local" --reruns 5
 
 %-test:
 	pytest -n auto -m "${*}"

{sqlframe-3.36.2 → sqlframe-3.36.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.36.2
+Version: 3.36.3
 Summary: Turning PySpark Into a Universal DataFrame API
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman

{sqlframe-3.36.2 → sqlframe-3.36.3}/docs/bigquery.md

@@ -507,6 +507,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [sum_distinct](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.sum_distinct.html)
 * [tan](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.tan.html)
 * [tanh](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.tanh.html)
+* [timestamp_add](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.timestamp_add.html)
 * [timestamp_seconds](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.timestamp_seconds.html)
 * [toDegrees](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.toDegrees.html)
 * [toRadians](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.toRadians.html)

{sqlframe-3.36.2 → sqlframe-3.36.3}/docs/duckdb.md

@@ -468,6 +468,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [sumDistinct](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.sumDistinct.html)
 * [sum_distinct](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.sum_distinct.html)
 * [tan](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.tan.html)
+* [timestamp_add](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.timestamp_add.html)
 * [timestamp_seconds](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.timestamp_seconds.html)
 * [toDegrees](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.toDegrees.html)
 * [toRadians](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.toRadians.html)

{sqlframe-3.36.2 → sqlframe-3.36.3}/docs/postgres.md

@@ -455,6 +455,8 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [sum_distinct](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.sum_distinct.html)
 * [tan](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.tan.html)
 * [tanh](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.tanh.html)
+* [timestamp_add](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.timestamp_add.html)
+  * The quantity argument must be literal, not a column
 * [timestamp_seconds](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.timestamp_seconds.html)
 * [toDegrees](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.toDegrees.html)
 * [toRadians](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.toRadians.html)

{sqlframe-3.36.2 → sqlframe-3.36.3}/docs/snowflake.md

@@ -507,6 +507,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [sum_distinct](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.sum_distinct.html)
 * [tan](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.tan.html)
 * [tanh](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.tanh.html)
+* [timestamp_add](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.timestamp_add.html)
 * [timestamp_seconds](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.timestamp_seconds.html)
 * [toDegrees](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.toDegrees.html)
 * [toRadians](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.toRadians.html)

{sqlframe-3.36.2 → sqlframe-3.36.3}/setup.py

@@ -41,6 +41,7 @@ setup(
             "pytest>=8.2.0,<8.5",
             "pytest-forked",
             "pytest-postgresql>=6,<8",
+            "pytest-rerunfailures",
             "pytest-xdist>=3.6,<3.9",
             "pre-commit>=3.7,<5",
             "ruff>=0.4.4,<0.13",

{sqlframe-3.36.2 → sqlframe-3.36.3}/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.36.3'
+__version_tuple__ = version_tuple = (3, 36, 3)

{sqlframe-3.36.2 → sqlframe-3.36.3}/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,

{sqlframe-3.36.2 → sqlframe-3.36.3}/sqlframe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.36.2
+Version: 3.36.3
 Summary: Turning PySpark Into a Universal DataFrame API
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman

{sqlframe-3.36.2 → sqlframe-3.36.3}/sqlframe.egg-info/requires.txt

@@ -22,6 +22,7 @@ pyarrow<21,>=10
 pyspark<3.6,>=2
 pytest-forked
 pytest-postgresql<8,>=6
+pytest-rerunfailures
 pytest-xdist<3.9,>=3.6
 pytest<8.5,>=8.2.0
 ruff<0.13,>=0.4.4

{sqlframe-3.36.2 → sqlframe-3.36.3}/tests/integration/engines/test_int_functions.py

@@ -1531,6 +1531,48 @@ def test_timestamp_seconds(get_session_and_func):
     )
 
 
+def test_timestamp_add(get_session_and_func, get_func):
+    session, timestamp_add = get_session_and_func("timestamp_add")
+    lit = get_func("lit", session)
+
+    # Test data from PySpark examples
+    df = session.createDataFrame(
+        [(datetime.datetime(2016, 3, 11, 9, 0, 7), 2), (datetime.datetime(2024, 4, 2, 9, 0, 7), 3)],
+        ["ts", "quantity"],
+    )
+
+    # Test adding years
+    if not session._is_postgres:
+        result = df.select(timestamp_add("year", "quantity", "ts")).collect()
+        expected_years = [
+            datetime.datetime(2018, 3, 11, 9, 0, 7),
+            datetime.datetime(2027, 4, 2, 9, 0, 7),
+        ]
+        for i, row in enumerate(result):
+            actual = row[0].replace(tzinfo=None) if row[0] else None
+            assert actual == expected_years[i], f"Year addition failed for row {i}"
+
+    # Test adding weeks
+    result = df.select(timestamp_add("WEEK", lit(5), "ts")).collect()
+    expected_weeks = [
+        datetime.datetime(2016, 4, 15, 9, 0, 7),
+        datetime.datetime(2024, 5, 7, 9, 0, 7),
+    ]
+    for i, row in enumerate(result):
+        actual = row[0].replace(tzinfo=None) if row[0] else None
+        assert actual == expected_weeks[i], f"Week addition failed for row {i}"
+
+    # Test subtracting days
+    result = df.select(timestamp_add("day", lit(-5), "ts")).collect()
+    expected_days = [
+        datetime.datetime(2016, 3, 6, 9, 0, 7),
+        datetime.datetime(2024, 3, 28, 9, 0, 7),
+    ]
+    for i, row in enumerate(result):
+        actual = row[0].replace(tzinfo=None) if row[0] else None
+        assert actual == expected_days[i], f"Day subtraction failed for row {i}"
+
+
 def test_window(get_session_and_func, get_func):
     session, window = get_session_and_func("window")
     sum = get_func("sum", session)

{sqlframe-3.36.2 → sqlframe-3.36.3}/tests/unit/standalone/test_functions.py

@@ -1544,6 +1544,24 @@ def test_timestamp_seconds(expression, expected):
     assert expression.column_expression.sql(dialect="spark") == expected
 
 
+@pytest.mark.parametrize(
+    "expression, expected",
+    [
+        (SF.timestamp_add("year", "quantity", "ts"), "DATE_ADD(YEAR, quantity, ts)"),
+        (SF.timestamp_add("WEEK", SF.lit(5), "ts"), "DATE_ADD(WEEK, 5, ts)"),
+        (SF.timestamp_add("day", SF.lit(-5), "ts"), "DATE_ADD(DAY, -5, ts)"),
+        (
+            SF.timestamp_add("hour", SF.col("quantity"), SF.col("ts")),
+            "DATE_ADD(HOUR, quantity, ts)",
+        ),
+        (SF.timestamp_add("second", SF.lit(120), "ts"), "DATE_ADD(SECOND, 120, ts)"),
+        (SF.timestamp_add("month", "quantity", "ts"), "DATE_ADD(MONTH, quantity, ts)"),
+    ],
+)
+def test_timestamp_add(expression, expected):
+    assert expression.column_expression.sql(dialect="spark") == expected
+
+
 @pytest.mark.parametrize(
     "expression, expected",
     [