diff --git a/external/duckdb b/external/duckdb index f5174f0d..bd560976 160000 --- a/external/duckdb +++ b/external/duckdb @@ -1 +1 @@ -Subproject commit f5174f0d6d01623b0dc56b8f62d1740ed6a1b49c +Subproject commit bd56097640dd7509c2baafe2734aa3830b17097d diff --git a/src/duckdb_py/pyconnection.cpp b/src/duckdb_py/pyconnection.cpp index 7a454b29..63fc11a0 100644 --- a/src/duckdb_py/pyconnection.cpp +++ b/src/duckdb_py/pyconnection.cpp @@ -296,7 +296,7 @@ void DuckDBPyConnection::UnregisterFilesystem(const py::str &name) { auto &database = con.GetDatabase(); auto &fs = database.GetFileSystem(); - fs.UnregisterSubSystem(name); + fs.ExtractSubSystem(name); } void DuckDBPyConnection::RegisterFilesystem(AbstractFileSystem filesystem) { diff --git a/src/duckdb_py/python_replacement_scan.cpp b/src/duckdb_py/python_replacement_scan.cpp index 843545e8..01804f53 100644 --- a/src/duckdb_py/python_replacement_scan.cpp +++ b/src/duckdb_py/python_replacement_scan.cpp @@ -1,7 +1,5 @@ #include "duckdb_python/python_replacement_scan.hpp" - #include "duckdb/main/db_instance_cache.hpp" - #include "duckdb_python/pybind11/pybind_wrapper.hpp" #include "duckdb/main/client_properties.hpp" #include "duckdb_python/numpy/numpy_type.hpp" @@ -14,6 +12,7 @@ #include "duckdb_python/pandas/pandas_scan.hpp" #include "duckdb/parser/tableref/subqueryref.hpp" #include "duckdb_python/pyrelation.hpp" +#include namespace duckdb { @@ -299,7 +298,7 @@ unique_ptr PythonReplacementScan::Replace(ClientContext &context, Repl optional_ptr data) { auto &table_name = input.table_name; auto &config = DBConfig::GetConfig(context); - if (!config.options.enable_external_access) { + if (!Settings::Get(config)) { return nullptr; }