fixed tests

Author: evertlammerts

duckdb/filesystem.py

@@ -21,9 +21,9 @@ class ModifiedMemoryFileSystem(MemoryFileSystem):
     # defer to the original implementation that doesn't hardcode the protocol
     _strip_protocol: typing.Callable[[str], str] = classmethod(AbstractFileSystem._strip_protocol.__func__)  # type: ignore[assignment]
 
-    def add_file(self, obj: io.IOBase | BytesIOWrapper, path: str) -> None:
+    def add_file(self, obj: io.IOBase | BytesIOWrapper | object, path: str) -> None:
         """Add a file to the filesystem."""
-        if not isinstance(obj, io.IOBase):
+        if not (hasattr(obj, "read") and hasattr(obj, "seek")):
             msg = "Can not read from a non file-like object"
             raise TypeError(msg)
         if isinstance(obj, io.TextIOBase):

duckdb/polars_io.py

@@ -224,7 +224,7 @@ def _pl_tree_to_sql(tree: _ExpressionTree) -> str:
         # Binary type
         if dtype == "Binary":
             bin_value = value["Binary"]
-            assert isinstance(bin_value, bytes), f"A {dtype} should be bytes but got {type(bin_value)}"
+            assert isinstance(bin_value, list), f"A {dtype} should be a list but got {type(bin_value)}"
             binary_data = bytes(bin_value)
             escaped = "".join(f"\\x{b:02x}" for b in binary_data)
             return f"'{escaped}'::BLOB"

tests/fast/adbc/test_connection_get_info.py

@@ -23,7 +23,7 @@ def test_connection_get_info_all(self):
         expected_result = pa.array(
             [
                 "duckdb",
-                "v" + duckdb.duckdb_version,  # don't hardcode this, as it will change every version
+                "v" + duckdb.__duckdb_version__,  # don't hardcode this, as it will change every version
                 "ADBC DuckDB Driver",
                 "(unknown)",
                 "(unknown)",

tests/fast/api/test_explain.py

@@ -15,9 +15,6 @@ def test_explain_standard(self, duckdb_cursor):
         res = duckdb_cursor.sql("select 42").explain("STANDARD")
         assert isinstance(res, str)
 
-        res = duckdb_cursor.sql("select 42").explain(duckdb.STANDARD)
-        assert isinstance(res, str)
-
         res = duckdb_cursor.sql("select 42").explain(duckdb.ExplainType.STANDARD)
         assert isinstance(res, str)
 

tests/fast/api/test_read_csv.py

@@ -92,7 +92,6 @@ def test_header_true(self, duckdb_cursor):
         print(res)
         assert res == (1, "Action", datetime.datetime(2006, 2, 15, 4, 46, 27))
 
-    @pytest.mark.skip(reason="Issue #6011 needs to be fixed first, header=False doesn't work correctly")
     def test_header_false(self, duckdb_cursor):
         duckdb_cursor.read_csv(TestFile("category.csv"), header=False)
 
@@ -383,13 +382,13 @@ def read(self, amount=-1):
     def test_filelike_non_readable(self, duckdb_cursor):
         _ = pytest.importorskip("fsspec")
         obj = 5
-        with pytest.raises(ValueError, match="Can not read from a non file-like object"):
+        with pytest.raises(TypeError, match="Can not read from a non file-like object"):
             duckdb_cursor.read_csv(obj).fetchall()
 
     def test_filelike_none(self, duckdb_cursor):
         _ = pytest.importorskip("fsspec")
         obj = None
-        with pytest.raises(ValueError, match="Can not read from a non file-like object"):
+        with pytest.raises(TypeError, match="Can not read from a non file-like object"):
             duckdb_cursor.read_csv(obj).fetchall()
 
     @pytest.mark.skip(reason="depends on garbage collector behaviour, and sporadically breaks in CI")