Skip to content

Commit e09edba

Browse files
committed
vendor: Update vendored sources to duckdb/duckdb@a0b525c
fix passing a null path to the C API instance cache (duckdb/duckdb#16474) [Python Dev] Make `pandas` not required in a couple places, check if it's installed in others (duckdb/duckdb#16414)
1 parent b70c03a commit e09edba

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/duckdb/src/function/table/version/pragma_version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifndef DUCKDB_PATCH_VERSION
2-
#define DUCKDB_PATCH_VERSION "1-dev214"
2+
#define DUCKDB_PATCH_VERSION "1-dev221"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 2
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.2.1-dev214"
11+
#define DUCKDB_VERSION "v1.2.1-dev221"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "318e783c48"
14+
#define DUCKDB_SOURCE_ID "a0b525cb6d"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/main/capi/duckdb-c.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ duckdb_state duckdb_open_internal(DBInstanceCacheWrapper *cache, const char *pat
3535
}
3636

3737
if (cache) {
38-
wrapper->database = cache->instance_cache->GetOrCreateInstance(path, *db_config, true);
38+
duckdb::string path_str;
39+
if (path) {
40+
path_str = path;
41+
}
42+
wrapper->database = cache->instance_cache->GetOrCreateInstance(path_str, *db_config, true);
3943
} else {
4044
wrapper->database = duckdb::make_shared_ptr<DuckDB>(path, db_config);
4145
}

0 commit comments

Comments
 (0)