Skip to content

Commit 07cc4bf

Browse files
committed
fix main builds
1 parent 4191d25 commit 07cc4bf

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

src/duckdb_py/include/duckdb_python/pandas/pandas_scan.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ struct PandasScanFunction : public TableFunction {
5555

5656
static void PandasSerialize(Serializer &serializer, const optional_ptr<FunctionData> bind_data,
5757
const TableFunction &function);
58+
59+
static unique_ptr<FunctionData> PandasDeserialize(Deserializer &deserializer, TableFunction &function);
5860
};
5961

6062
} // namespace duckdb

src/duckdb_py/pandas/scan.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ PandasScanFunction::PandasScanFunction()
6666
cardinality = PandasScanCardinality;
6767
table_scan_progress = PandasProgress;
6868
serialize = PandasSerialize;
69+
deserialize = PandasDeserialize;
6970
projection_pushdown = true;
7071
}
7172

@@ -235,4 +236,8 @@ void PandasScanFunction::PandasSerialize(Serializer &serializer, const optional_
235236
throw NotImplementedException("PandasScan function cannot be serialized");
236237
}
237238

239+
unique_ptr<FunctionData> PandasScanFunction::PandasDeserialize(Deserializer &deserializer, TableFunction &function) {
240+
throw NotImplementedException("PandasScan function cannot be deserialized");
241+
}
242+
238243
} // namespace duckdb

tests/fast/adbc/test_adbc.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import pytest
66

77
adbc_driver_manager = pytest.importorskip("adbc_driver_manager")
8+
adbc_driver_manager_dbapi = pytest.importorskip("adbc_driver_manager.dbapi")
89
adbc_driver_duckdb = pytest.importorskip("adbc_driver_duckdb")
910
pyarrow = pytest.importorskip("pyarrow")
1011

@@ -14,7 +15,7 @@
1415

1516
@pytest.fixture
1617
def duck_conn():
17-
with adbc_driver_manager.dbapi.connect(driver=driver_path, entrypoint="duckdb_adbc_init") as conn:
18+
with adbc_driver_manager_dbapi.connect(driver=driver_path, entrypoint="duckdb_adbc_init") as conn:
1819
yield conn
1920

2021

@@ -93,7 +94,7 @@ def test_commit(tmp_path):
9394
table = example_table()
9495
db_kwargs = {"path": f"{db}"}
9596
# Start connection with auto-commit off
96-
with adbc_driver_manager.dbapi.connect(
97+
with adbc_driver_manager_dbapi.connect(
9798
driver=driver_path,
9899
entrypoint="duckdb_adbc_init",
99100
db_kwargs=db_kwargs,
@@ -103,7 +104,7 @@ def test_commit(tmp_path):
103104
cur.adbc_ingest("ingest", table, "create")
104105

105106
# Check Data is not there
106-
with adbc_driver_manager.dbapi.connect(
107+
with adbc_driver_manager_dbapi.connect(
107108
driver=driver_path,
108109
entrypoint="duckdb_adbc_init",
109110
db_kwargs=db_kwargs,
@@ -122,7 +123,7 @@ def test_commit(tmp_path):
122123

123124
# This now works because we enabled autocommit
124125
with (
125-
adbc_driver_manager.dbapi.connect(
126+
adbc_driver_manager_dbapi.connect(
126127
driver=driver_path,
127128
entrypoint="duckdb_adbc_init",
128129
db_kwargs=db_kwargs,
@@ -216,8 +217,8 @@ def test_insertion(duck_conn):
216217
# Test Append
217218
with duck_conn.cursor() as cursor:
218219
with pytest.raises(
219-
adbc_driver_manager.InternalError,
220-
match=r'Table with name "ingest_table" already exists!',
220+
adbc_driver_manager.ProgrammingError,
221+
match=r'ALREADY_EXISTS',
221222
):
222223
cursor.adbc_ingest("ingest_table", table, "create")
223224
cursor.adbc_ingest("ingest_table", table, "append")
@@ -294,7 +295,7 @@ def test_large_chunk(tmp_path):
294295
db.unlink()
295296
db_kwargs = {"path": f"{db}"}
296297
with (
297-
adbc_driver_manager.dbapi.connect(
298+
adbc_driver_manager_dbapi.connect(
298299
driver=driver_path,
299300
entrypoint="duckdb_adbc_init",
300301
db_kwargs=db_kwargs,
@@ -320,7 +321,7 @@ def test_dictionary_data(tmp_path):
320321
db.unlink()
321322
db_kwargs = {"path": f"{db}"}
322323
with (
323-
adbc_driver_manager.dbapi.connect(
324+
adbc_driver_manager_dbapi.connect(
324325
driver=driver_path,
325326
entrypoint="duckdb_adbc_init",
326327
db_kwargs=db_kwargs,
@@ -348,7 +349,7 @@ def test_ree_data(tmp_path):
348349
db.unlink()
349350
db_kwargs = {"path": f"{db}"}
350351
with (
351-
adbc_driver_manager.dbapi.connect(
352+
adbc_driver_manager_dbapi.connect(
352353
driver=driver_path,
353354
entrypoint="duckdb_adbc_init",
354355
db_kwargs=db_kwargs,

0 commit comments

Comments
 (0)