From 6fc7f1708cd1659a483c515b9d28ebdc4d5ad6f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 08:57:03 +0000 Subject: [PATCH] chore: Update vendored sources to duckdb/duckdb@6d9d429d5e7f464b69671b46dcbc99a6e46378df (#399) [Fix] C API - Correct type comparison in MAP value functions (duckdb/duckdb#13844) Co-authored-by: krlmlr --- src/duckdb/src/function/table/version/pragma_version.cpp | 6 +++--- src/duckdb/src/main/capi/duckdb_value-c.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp index a947648e0..0bce7fffe 100644 --- a/src/duckdb/src/function/table/version/pragma_version.cpp +++ b/src/duckdb/src/function/table/version/pragma_version.cpp @@ -1,5 +1,5 @@ #ifndef DUCKDB_PATCH_VERSION -#define DUCKDB_PATCH_VERSION "1-dev25" +#define DUCKDB_PATCH_VERSION "1-dev29" #endif #ifndef DUCKDB_MINOR_VERSION #define DUCKDB_MINOR_VERSION 1 @@ -8,10 +8,10 @@ #define DUCKDB_MAJOR_VERSION 1 #endif #ifndef DUCKDB_VERSION -#define DUCKDB_VERSION "v1.1.1-dev25" +#define DUCKDB_VERSION "v1.1.1-dev29" #endif #ifndef DUCKDB_SOURCE_ID -#define DUCKDB_SOURCE_ID "d9e89b5cc1" +#define DUCKDB_SOURCE_ID "6d9d429d5e" #endif #include "duckdb/function/table/system_functions.hpp" #include "duckdb/main/database.hpp" diff --git a/src/duckdb/src/main/capi/duckdb_value-c.cpp b/src/duckdb/src/main/capi/duckdb_value-c.cpp index b231f9195..defdf6a3b 100644 --- a/src/duckdb/src/main/capi/duckdb_value-c.cpp +++ b/src/duckdb/src/main/capi/duckdb_value-c.cpp @@ -282,7 +282,7 @@ idx_t duckdb_get_map_size(duckdb_value value) { } auto val = UnwrapValue(value); - if (val.type() != LogicalTypeId::MAP) { + if (val.type().id() != LogicalTypeId::MAP) { return 0; } @@ -296,7 +296,7 @@ duckdb_value duckdb_get_map_key(duckdb_value value, idx_t index) { } auto val = UnwrapValue(value); - if (val.type() != LogicalTypeId::MAP) { + if (val.type().id() != LogicalTypeId::MAP) { return nullptr; } @@ -316,7 +316,7 @@ duckdb_value duckdb_get_map_value(duckdb_value value, idx_t index) { } auto val = UnwrapValue(value); - if (val.type() != LogicalTypeId::MAP) { + if (val.type().id() != LogicalTypeId::MAP) { return nullptr; }