Skip to content

Commit 9ef5bf6

Browse files
committed
fix: 1.4 specific changes
1 parent f7068b8 commit 9ef5bf6

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/MainDistributionPipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Build extension binaries
1515
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
1616
with:
17-
duckdb_version: main
17+
duckdb_version: 1.4-andium
1818
ci_tools_version: main
1919
extension_name: adbc_scanner
2020
exclude_archs: wasm_mvp;wasm_eh;wasm_threads;

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ build_static_extension(${TARGET_NAME} ${EXTENSION_SOURCES})
4949
build_loadable_extension(${TARGET_NAME} " " ${EXTENSION_SOURCES})
5050

5151
# Link dependencies in both the static library and the loadable extension
52-
target_link_libraries(${EXTENSION_NAME} AdbcDriverManager::adbc_driver_manager_static tomlplusplus::tomlplusplus nanoarrow::nanoarrow)
53-
target_link_libraries(${LOADABLE_EXTENSION_NAME} AdbcDriverManager::adbc_driver_manager_static tomlplusplus::tomlplusplus nanoarrow::nanoarrow)
52+
target_link_libraries(${EXTENSION_NAME} tomlplusplus::tomlplusplus nanoarrow::nanoarrow)
53+
target_link_libraries(${LOADABLE_EXTENSION_NAME} tomlplusplus::tomlplusplus nanoarrow::nanoarrow)
5454

5555
# On Windows, when linking statically, we need to define ADBC_EXPORT as empty
5656
# to prevent __declspec(dllimport) from being used

duckdb

Submodule duckdb updated 2840 files

src/adbc_connection.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ shared_ptr<AdbcConnectionWrapper> CreateConnectionFromOptions(const vector<pair<
5353
database->Init();
5454

5555
// Enable manifest-based driver discovery by default
56-
if (use_manifests) {
57-
database->SetLoadFlags(ADBC_LOAD_FLAG_DEFAULT);
58-
} else {
59-
database->SetLoadFlags(ADBC_LOAD_FLAG_ALLOW_RELATIVE_PATHS);
60-
}
56+
// if (use_manifests) {
57+
// database->SetLoadFlags(ADBC_LOAD_FLAG_DEFAULT);
58+
// } else {
59+
// database->SetLoadFlags(ADBC_LOAD_FLAG_ALLOW_RELATIVE_PATHS);
60+
// }
6161

6262
// Set additional search paths if provided
63-
if (!search_paths.empty()) {
64-
database->SetAdditionalSearchPaths(search_paths);
65-
}
63+
// if (!search_paths.empty()) {
64+
// database->SetAdditionalSearchPaths(search_paths);
65+
// }
6666

6767
// Set driver (required)
6868
database->SetOption("driver", driver);

0 commit comments

Comments
 (0)