sqlframe 3.43.4__tar.gz → 3.43.6__tar.gz

{sqlframe-3.43.4 → sqlframe-3.43.6}/PKG-INFO

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

{sqlframe-3.43.4 → sqlframe-3.43.6}/docs/bigquery.md

@@ -684,7 +684,7 @@ update_expr = table_employee.update(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the update statement
+# Executes the update statement
 update_expr.execute()
 
 # Show the result
@@ -712,7 +712,7 @@ delete_expr = table_employee.delete(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the delete statement
+# Executes the delete statement
 delete_expr.execute()
 
 # Show the result
@@ -767,7 +767,7 @@ merge_expr = table_employee.merge(
     ],
 )
 
-# Excecutes the merge statement
+# Executes the merge statement
 merge_expr.execute()
 
 # Show the result
@@ -823,7 +823,7 @@ merge_expr = table_employee.merge(
     ],
 )
 
-# Excecutes the merge statement
+# Executes the merge statement
 merge_expr.execute()
 
 # Show the result

{sqlframe-3.43.4 → sqlframe-3.43.6}/docs/databricks.md

@@ -227,7 +227,7 @@ update_expr = table_employee.update(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the update statement
+# Executes the update statement
 update_expr.execute()
 
 # Show the result
@@ -255,7 +255,7 @@ delete_expr = table_employee.delete(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the delete statement
+# Executes the delete statement
 delete_expr.execute()
 
 # Show the result
@@ -310,7 +310,7 @@ merge_expr = table_employee.merge(
     ],
 )
 
-# Excecutes the merge statement
+# Executes the merge statement
 merge_expr.execute()
 
 # Show the result
@@ -366,7 +366,7 @@ merge_expr = table_employee.merge(
     ],
 )
 
-# Excecutes the merge statement
+# Executes the merge statement
 merge_expr.execute()
 
 # Show the result

{sqlframe-3.43.4 → sqlframe-3.43.6}/docs/duckdb.md

@@ -250,7 +250,7 @@ See something that you would like to see supported? [Open an issue](https://gith
     * SQLFrame Specific: Get the SQL representation of the WindowSpec
 * [stat](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.DataFrame.stat.html)
 * [toArrow](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.DataFrame.toArrow.html)
-  * SQLFrame Specific Argument: `batch_size` sets the number of rows to read per-batch and returns a `RecrodBatchReader`
+  * SQLFrame Specific Argument: `batch_size` sets the number of rows to read per-batch and returns a `RecordBatchReader`
 * [toDF](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.DataFrame.toDF.html)
 * [toPandas](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.DataFrame.toPandas.html)
 * [union](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.DataFrame.union.html)
@@ -478,6 +478,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)
+* [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)
@@ -634,7 +635,7 @@ update_expr = table_employee.update(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the update statement
+# Executes the update statement
 update_expr.execute()
 
 # Show the result
@@ -662,7 +663,7 @@ delete_expr = table_employee.delete(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the delete statement
+# Executes the delete statement
 delete_expr.execute()
 
 # Show the result

{sqlframe-3.43.4 → sqlframe-3.43.6}/docs/postgres.md

@@ -621,7 +621,7 @@ update_expr = table_employee.update(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the update statement
+# Executes the update statement
 update_expr.execute()
 
 # Show the result
@@ -649,7 +649,7 @@ delete_expr = table_employee.delete(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the delete statement
+# Executes the delete statement
 delete_expr.execute()
 
 # Show the result
@@ -704,7 +704,7 @@ merge_expr = table_employee.merge(
     ],
 )
 
-# Excecutes the merge statement
+# Executes the merge statement
 merge_expr.execute()
 
 # Show the result
@@ -760,7 +760,7 @@ merge_expr = table_employee.merge(
     ],
 )
 
-# Excecutes the merge statement
+# Executes the merge statement
 merge_expr.execute()
 
 # Show the result

{sqlframe-3.43.4 → sqlframe-3.43.6}/docs/redshift.md

@@ -209,7 +209,7 @@ update_expr = table_employee.update(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the update statement
+# Executes the update statement
 update_expr.execute()
 
 # Show the result
@@ -237,7 +237,7 @@ delete_expr = table_employee.delete(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the delete statement
+# Executes the delete statement
 delete_expr.execute()
 
 # Show the result

{sqlframe-3.43.4 → sqlframe-3.43.6}/docs/snowflake.md

@@ -309,7 +309,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [array_except](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.array_except.html)
 * [array_intersect](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.array_intersect.html)
 * [array_join](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.array_join.html)
-  * Null values are repsented as nothing instead of NULL. Ex: "a," instead of "a,NULL"
+  * Null values are represented as nothing instead of NULL. Ex: "a," instead of "a,NULL"
 * [array_max](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.array_max.html)
 * [array_min](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.array_min.html)
 * [array_position](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.array_position.html)
@@ -335,7 +335,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [bool_and](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.bool_and.html)
 * [bool_or](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.bool_or.html)
 * [bround](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.bround.html)
-  * [Input must be a fixed-point nnumber](https://docs.snowflake.com/en/sql-reference/data-types-numeric.html#label-data-types-for-fixed-point-numbers)
+  * [Input must be a fixed-point number](https://docs.snowflake.com/en/sql-reference/data-types-numeric.html#label-data-types-for-fixed-point-numbers)
 * [btrim](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.btrim.html)
 * [call_function](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.call_function.html)
 * [cbrt](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.cbrt.html)
@@ -677,7 +677,7 @@ update_expr = table_employee.update(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the update statement
+# Executes the update statement
 update_expr.execute()
 
 # Show the result
@@ -705,7 +705,7 @@ delete_expr = table_employee.delete(
     where=table_employee["id"] == 1,
 )
 
-# Excecutes the delete statement
+# Executes the delete statement
 delete_expr.execute()
 
 # Show the result
@@ -760,7 +760,7 @@ merge_expr = table_employee.merge(
     ],
 )
 
-# Excecutes the merge statement
+# Executes the merge statement
 merge_expr.execute()
 
 # Show the result

{sqlframe-3.43.4 → sqlframe-3.43.6}/setup.py

@@ -20,7 +20,7 @@ setup(
     python_requires=">=3.9",
     install_requires=[
         "prettytable<4",
-        "sqlglot>=24.0.0,<27.22",
+        "sqlglot>=24.0.0,<27.27",
         "typing_extensions",
         "more-itertools",
     ],

{sqlframe-3.43.4 → sqlframe-3.43.6}/sqlframe/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '3.43.4'
-__version_tuple__ = version_tuple = (3, 43, 4)
+__version__ = version = '3.43.6'
+__version_tuple__ = version_tuple = (3, 43, 6)
 
-__commit_id__ = commit_id = 'g4171ad4a5'
+__commit_id__ = commit_id = 'g7c6cd19ef'

{sqlframe-3.43.4 → sqlframe-3.43.6}/sqlframe/base/dataframe.py

@@ -361,15 +361,31 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
 
     def _replace_cte_names_with_hashes(self, expression: exp.Select):
         replacement_mapping = {}
-        for cte in expression.ctes:
+        seen_hashes: t.Dict[str, exp.Identifier] = {}
+        cte_indices_to_remove = []
+
+        for i, cte in enumerate(expression.ctes):
             old_name_id = cte.args["alias"].this
-            new_hashed_id = exp.to_identifier(
-                self._create_hash_from_expression(cte.this), quoted=old_name_id.args["quoted"]
-            )
-            replacement_mapping[old_name_id] = new_hashed_id
+            cte_hash = self._create_hash_from_expression(cte.this)
+
+            if cte_hash in seen_hashes:
+                # Duplicate CTE found - map its old name to the existing hash
+                replacement_mapping[old_name_id] = seen_hashes[cte_hash]
+                cte_indices_to_remove.append(i)
+            else:
+                # New unique CTE - process normally
+                new_hashed_id = exp.to_identifier(cte_hash, quoted=old_name_id.args["quoted"])
+                seen_hashes[cte_hash] = new_hashed_id
+                replacement_mapping[old_name_id] = new_hashed_id
+
             expression = expression.transform(replace_id_value, replacement_mapping).assert_is(
                 exp.Select
             )
+
+        # Remove duplicate CTEs by index in reverse order to avoid index shifting
+        for idx in reversed(cte_indices_to_remove):
+            del expression.args["with"].expressions[idx]
+
         return expression
 
     def _create_cte_from_expression(

{sqlframe-3.43.4 → sqlframe-3.43.6}/sqlframe/base/functions.py

@@ -309,7 +309,7 @@ def factorial(col: ColumnOrName) -> Column:
     if session._is_bigquery:
         return factorial_from_case_statement(col)
 
-    return Column.invoke_anonymous_function(col, "FACTORIAL")
+    return Column.invoke_expression_over_column(col, expression.Factorial)
 
 
 @meta()
@@ -385,9 +385,9 @@ def tan(col: ColumnOrName) -> Column:
     return Column.invoke_expression_over_column(col, expression.Tan)
 
 
-@meta(unsupported_engines="duckdb")
+@meta()
 def tanh(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "TANH")
+    return Column.invoke_expression_over_column(col, expression.Tanh)
 
 
 @meta()
@@ -4886,7 +4886,7 @@ def parse_url(
     )
 
 
-@meta(unsupported_engines="*")
+@meta(unsupported_engines=["bigquery", "snowflake"])
 def pi() -> Column:
     """Returns Pi.
 
@@ -4901,7 +4901,7 @@ def pi() -> Column:
     |3.141592653589793|
     +-----------------+
     """
-    return Column.invoke_anonymous_function(None, "pi")
+    return Column.invoke_expression_over_column(None, expression.Pi)
 
 
 @meta(unsupported_engines="*")

{sqlframe-3.43.4 → sqlframe-3.43.6}/sqlframe/base/operations.py

@@ -78,7 +78,7 @@ def operation(
 
 # Here decorate a function (self: _BaseGroupedData[DF], *args, **kwargs) -> DF
 # Hence we work with t.Callable[Concatenate[_BaseGroupedData[DF], P], DF]
-# We simplify the parameters, as Pyright (used for VSCode autocomplete) doesn't unterstand this
+# We simplify the parameters, as Pyright (used for VSCode autocomplete) doesn't understand this
 def group_operation(
     op: Operation,
 ) -> t.Callable[[t.Callable[P, DF]], t.Callable[P, DF]]:

{sqlframe-3.43.4 → sqlframe-3.43.6}/sqlframe/base/util.py

@@ -239,7 +239,7 @@ def soundex(s):
     result = [s[0]]
     count = 1
 
-    # find would-be replacment for first character
+    # find would-be replacement for first character
     for lset, sub in replacements:
         if s[0] in lset:
             last = sub

{sqlframe-3.43.4 → sqlframe-3.43.6}/sqlframe/databricks/readwriter.py

@@ -231,7 +231,7 @@ class DatabricksDataFrameWriter(
             elif mode == "ignore":
                 pass
             else:
-                raise RuntimeError(f"Unssuported mode: {mode}")
+                raise RuntimeError(f"Unsupported mode: {mode}")
 
     def insertInto(
         self,

{sqlframe-3.43.4 → sqlframe-3.43.6}/sqlframe/duckdb/session.py

@@ -7,10 +7,7 @@ from sqlframe.base.session import _BaseSession
 from sqlframe.base.util import soundex
 from sqlframe.duckdb.catalog import DuckDBCatalog
 from sqlframe.duckdb.dataframe import DuckDBDataFrame
-from sqlframe.duckdb.readwriter import (
-    DuckDBDataFrameReader,
-    DuckDBDataFrameWriter,
-)
+from sqlframe.duckdb.readwriter import DuckDBDataFrameReader, DuckDBDataFrameWriter
 from sqlframe.duckdb.table import DuckDBTable
 from sqlframe.duckdb.udf import DuckDBUDFRegistration
 
@@ -42,7 +39,11 @@ class DuckDBSession(
     def __init__(self, conn: t.Optional[DuckDBPyConnection] = None, *args, **kwargs):
         import duckdb
         from duckdb import InvalidInputException
-        from duckdb.typing import VARCHAR
+
+        try:  # Available from duckdb 1.4.1
+            from duckdb.sqltypes import VARCHAR
+        except ImportError:
+            from duckdb.typing import VARCHAR
 
         if not hasattr(self, "_conn"):
             conn = conn or duckdb.connect()

{sqlframe-3.43.4 → sqlframe-3.43.6}/sqlframe.egg-info/PKG-INFO

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

{sqlframe-3.43.4 → sqlframe-3.43.6}/sqlframe.egg-info/requires.txt

@@ -1,6 +1,6 @@
 more-itertools
 prettytable<4
-sqlglot<27.22,>=24.0.0
+sqlglot<27.27,>=24.0.0
 typing_extensions
 
 [bigquery]

{sqlframe-3.43.4 → sqlframe-3.43.6}/tests/integration/engines/duck/test_duckdb_dataframe.py

@@ -4,6 +4,7 @@ import pytest
 
 from sqlframe.base import types
 from sqlframe.duckdb import DuckDBDataFrame, DuckDBSession
+from sqlframe.duckdb import functions as F
 
 pytest_plugins = ["tests.integration.fixtures"]
 
@@ -266,3 +267,23 @@ def test_explain(duckdb_employee: DuckDBDataFrame, capsys):
 └───────────────────────────┘
 """.strip()
     )
+
+
+def test_duplicate_cte(duckdb_session: DuckDBSession):
+    con = duckdb_session._conn
+
+    con.execute("CREATE VIEW foo AS SELECT 'a' as key, 1 as idx")
+    con.execute("CREATE VIEW bar AS SELECT 'b' as key, 2 as smth")
+
+    foo = duckdb_session.table("foo").filter(F.col("idx") == 1)
+    bar = duckdb_session.table("bar").filter(F.col("smth") == 2)
+
+    df = foo.join(bar, "key", "left")
+
+    df = df.unionByName(df)
+
+    results = duckdb_session._collect(expressions=df._get_expressions(optimize=True))
+    assert results == [
+        types.Row(key="a", idx=1, smth=None),
+        types.Row(key="a", idx=1, smth=None),
+    ]

{sqlframe-3.43.4 → sqlframe-3.43.6}/tests/integration/engines/test_int_functions.py

@@ -4424,7 +4424,7 @@ def test_parse_url(get_session_and_func, get_func):
 
 def test_pi(get_session_and_func, get_func):
     session, pi = get_session_and_func("pi")
-    assert session.range(1).select(pi()).first()[0] == math.pi
+    assert session.range(1).select(pi()).first()[0] in (math.pi, 3.141592654)
 
 
 def test_pmod(get_session_and_func, get_func):