sqlframe 1.1.1__tar.gz → 1.1.2__tar.gz

{sqlframe-1.1.1 → sqlframe-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 1.1.1
+Version: 1.1.2
 Summary: Taking the Spark out of PySpark by converting to SQL
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman

{sqlframe-1.1.1 → sqlframe-1.1.2}/sqlframe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.1'
-__version_tuple__ = version_tuple = (1, 1, 1)
+__version__ = version = '1.1.2'
+__version_tuple__ = version_tuple = (1, 1, 2)

{sqlframe-1.1.1 → sqlframe-1.1.2}/sqlframe/duckdb/readwriter.py

@@ -74,7 +74,10 @@ class DuckDBDataFrameReader(_BaseDataFrameReader["DuckDBSession", "DuckDBDataFra
         """
         if schema:
             column_mapping = ensure_column_mapping(schema)
-            select_columns = [x.expression for x in self._to_casted_columns(column_mapping)]
+            select_column_mapping = column_mapping.copy()
+            if options.get("filename"):
+                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()]

{sqlframe-1.1.1 → sqlframe-1.1.2}/sqlframe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 1.1.1
+Version: 1.1.2
 Summary: Taking the Spark out of PySpark by converting to SQL
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman

{sqlframe-1.1.1 → sqlframe-1.1.2}/tests/integration/engines/duck/test_duckdb_reader.py

@@ -17,13 +17,56 @@ def test_employee_extra_line_csv(duckdb_session: DuckDBSession):
         auto_detect=False,
     )
     assert df.collect() == [
-        Row(**{"employee_id": 1, "fname": "Jack", "lname": "Shephard", "age": 37, "store_id": 1}),
-        Row(**{"employee_id": 2, "fname": "John", "lname": "Locke", "age": 65, "store_id": 1}),
-        Row(**{"employee_id": 3, "fname": "Kate", "lname": "Austen", "age": 37, "store_id": 2}),
         Row(
-            **{"employee_id": 4, "fname": "Claire", "lname": "Littleton", "age": 27, "store_id": 2}
+            **{
+                "employee_id": 1,
+                "fname": "Jack",
+                "lname": "Shephard",
+                "age": 37,
+                "store_id": 1,
+                "filename": "tests/fixtures/employee_extra_line.csv",
+            }
+        ),
+        Row(
+            **{
+                "employee_id": 2,
+                "fname": "John",
+                "lname": "Locke",
+                "age": 65,
+                "store_id": 1,
+                "filename": "tests/fixtures/employee_extra_line.csv",
+            }
+        ),
+        Row(
+            **{
+                "employee_id": 3,
+                "fname": "Kate",
+                "lname": "Austen",
+                "age": 37,
+                "store_id": 2,
+                "filename": "tests/fixtures/employee_extra_line.csv",
+            }
+        ),
+        Row(
+            **{
+                "employee_id": 4,
+                "fname": "Claire",
+                "lname": "Littleton",
+                "age": 27,
+                "store_id": 2,
+                "filename": "tests/fixtures/employee_extra_line.csv",
+            }
+        ),
+        Row(
+            **{
+                "employee_id": 5,
+                "fname": "Hugo",
+                "lname": "Reyes",
+                "age": 29,
+                "store_id": 100,
+                "filename": "tests/fixtures/employee_extra_line.csv",
+            }
         ),
-        Row(**{"employee_id": 5, "fname": "Hugo", "lname": "Reyes", "age": 29, "store_id": 100}),
     ]
 
 
@@ -34,7 +77,7 @@ def test_employee_extra_line_csv_multiple(duckdb_session: DuckDBSession):
         schema="employee_id INT, fname STRING, lname STRING, age INT, store_id INT",
         skip=1,
         header=1,
-        filename=1,
+        filename=0,
         null_padding=True,
         ignore_errors=1,
         auto_detect=False,