Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@a2a7ec2
Browse files Browse the repository at this point in the history
Merge pull request duckdb/duckdb#13421 from Tmonster/fix_dsdgen_args
Merge pull request duckdb/duckdb#13420 from cyberjunk/fix/httpfs-undefined-symbol
  • Loading branch information
krlmlr committed Aug 15, 2024
1 parent 22a84d4 commit 52dc803
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions src/duckdb/src/function/table/query_function.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ static unique_ptr<SubqueryRef> 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<bool>()))
? "BY NAME "
Expand Down
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down

0 comments on commit 52dc803

Please sign in to comment.