sqlframe 3.39.0__tar.gz → 3.39.1__tar.gz

{sqlframe-3.39.0 → sqlframe-3.39.1}/PKG-INFO

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

{sqlframe-3.39.0 → sqlframe-3.39.1}/sqlframe/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '3.39.0'
-__version_tuple__ = version_tuple = (3, 39, 0)
+__version__ = version = '3.39.1'
+__version_tuple__ = version_tuple = (3, 39, 1)
+
+__commit_id__ = commit_id = 'g0245f44bb'

{sqlframe-3.39.0 → sqlframe-3.39.1}/sqlframe/base/util.py

@@ -113,9 +113,13 @@ def get_tables_from_expression_with_join(expression: exp.Select) -> t.List[exp.T
 
 
 def to_csv(options: t.Dict[str, OptionalPrimitiveType], equality_char: str = "=") -> str:
-    return ", ".join(
-        [f"{k}{equality_char}{v}" for k, v in (options or {}).items() if v is not None]
-    )
+    results = []
+    for k, v in (options or {}).items():
+        if v is None:
+            continue
+        v = f"'{v}'" if isinstance(v, str) else v
+        results.append(f"{k}{equality_char}{v}")
+    return ", ".join(results)
 
 
 def ensure_column_mapping(schema: t.Union[str, StructType]) -> t.Dict:

{sqlframe-3.39.0 → sqlframe-3.39.1}/sqlframe/databricks/catalog.py

@@ -461,11 +461,7 @@ class DatabricksCatalog(
             exp.Property(this=sg.to_identifier(name=k), value=exp.convert(value=v))
             for k, v in (table_properties if isinstance(table_properties, dict) else {}).items()
         )
-
-        format_options: dict[str, t.Union[bool, float, int, str, None]] = {
-            key: f"'{val}'" for key, val in options.items() if val is not None
-        }
-        format_options_str = to_csv(format_options, " ")
+        format_options_str = to_csv(options, " ")  # type: ignore
 
         output_expression_container = exp.Create(
             this=exp.Schema(

{sqlframe-3.39.0 → sqlframe-3.39.1}/sqlframe/databricks/readwriter.py

@@ -128,8 +128,6 @@ class DatabricksDataFrameReader(
                 format_options["schema"] = f"{schema}"
             if "inferSchema" in format_options:
                 format_options["inferColumnTypes"] = format_options.pop("inferSchema")
-
-            format_options = {key: f"'{val}'" for key, val in format_options.items()}
             format_options_str = to_csv(format_options, " => ")
 
             from_clause = f"read_files('{paths}', {format_options_str})"
@@ -338,10 +336,7 @@ class DatabricksDataFrameWriter(
         format_options_str = ""
         if format is not None:
             properties.append(exp.FileFormatProperty(this=exp.Var(this=format.upper())))
-            format_options: dict[str, OptionalPrimitiveType] = {
-                key: f"'{val}'" for key, val in options.items() if val is not None
-            }
-            format_options_str = to_csv(format_options, " ")
+            format_options_str = to_csv(options, " ")
 
         if path is not None and isinstance(path, str):
             properties.append(exp.LocationProperty(this=exp.convert(path)))

{sqlframe-3.39.0 → sqlframe-3.39.1}/sqlframe/duckdb/readwriter.py

@@ -86,10 +86,7 @@ class DuckDBDataFrameReader(
                 select_column_mapping["filename"] = "VARCHAR"
             select_columns = [x.expression for x in self._to_casted_columns(select_column_mapping)]
             if format == "csv":
-                duckdb_columns = ", ".join(
-                    [f"'{column}': '{dtype}'" for column, dtype in column_mapping.items()]
-                )
-                merged_options["columns"] = "{" + duckdb_columns + "}"
+                merged_options["columns"] = column_mapping  # type: ignore
         else:
             select_columns = [exp.Star()]
         if format == "delta":

{sqlframe-3.39.0 → sqlframe-3.39.1}/sqlframe/spark/readwriter.py

@@ -110,7 +110,6 @@ class SparkDataFrameReader(
             if schema:
                 format_options["schema"] = f"{schema}"
                 format_options.pop("inferSchema", None)
-            format_options = {key: f"'{val}'" for key, val in format_options.items()}
             format_options_str = to_csv(format_options, " ")
 
             tmp_view = f"CREATE OR REPLACE TEMPORARY VIEW {tmp_view_key} USING {format}" + (

{sqlframe-3.39.0 → sqlframe-3.39.1}/sqlframe.egg-info/PKG-INFO

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

{sqlframe-3.39.0 → sqlframe-3.39.1}/tests/integration/engines/duck/test_duckdb_reader.py

@@ -20,6 +20,7 @@ def test_employee_extra_line_csv(duckdb_session: DuckDBSession):
         null_padding=True,
         ignore_errors=1,
         auto_detect=False,
+        sep=",",
     )
     assert df.collect() == [
         Row(