From 52dc8031930c66e3bc8f5b1fe71c4605ba172bfa Mon Sep 17 00:00:00 2001 From: krlmlr Date: Thu, 15 Aug 2024 16:21:39 +0000 Subject: [PATCH] chore: Update vendored sources to duckdb/duckdb@a2a7ec2c82d6df572bfb3c4a1b6a1cb26b6ce693 Merge pull request duckdb/duckdb#13421 from Tmonster/fix_dsdgen_args Merge pull request duckdb/duckdb#13420 from cyberjunk/fix/httpfs-undefined-symbol --- src/duckdb/src/function/table/query_function.cpp | 5 +++++ src/duckdb/src/function/table/version/pragma_version.cpp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/duckdb/src/function/table/query_function.cpp b/src/duckdb/src/function/table/query_function.cpp index 8a18b1cb3..d000c03ac 100644 --- a/src/duckdb/src/function/table/query_function.cpp +++ b/src/duckdb/src/function/table/query_function.cpp @@ -17,6 +17,11 @@ static unique_ptr ParseSubquery(const string &query, const ParserOp } static void UnionTablesQuery(TableFunctionBindInput &input, string &query) { + for (auto &input_val : input.inputs) { + if (input_val.IsNull()) { + throw BinderException("Cannot use NULL as function argument"); + } + } string by_name = (input.inputs.size() == 2 && (input.inputs[1].type().id() == LogicalTypeId::BOOLEAN && input.inputs[1].GetValue())) ? "BY NAME " diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp index c509b54ec..c9664a7ea 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-dev4165" +#define DUCKDB_PATCH_VERSION "1-dev4172" #endif #ifndef DUCKDB_MINOR_VERSION #define DUCKDB_MINOR_VERSION 0 @@ -8,10 +8,10 @@ #define DUCKDB_MAJOR_VERSION 1 #endif #ifndef DUCKDB_VERSION -#define DUCKDB_VERSION "v1.0.1-dev4165" +#define DUCKDB_VERSION "v1.0.1-dev4172" #endif #ifndef DUCKDB_SOURCE_ID -#define DUCKDB_SOURCE_ID "709a18da59" +#define DUCKDB_SOURCE_ID "a2a7ec2c82" #endif #include "duckdb/function/table/system_functions.hpp" #include "duckdb/main/database.hpp"