Skip to content

Commit fb445eb

Browse files
chore: Update vendored sources to duckdb/duckdb@1986445 (#580)
fix scoping problem with function argument (duckdb/duckdb#14666) Bump extensions: AWS, Delta, Iceberg, INET (duckdb/duckdb#14669) bump vss + spatial (duckdb/duckdb#14667) Co-authored-by: krlmlr <[email protected]>
1 parent eb30517 commit fb445eb

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
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 "3-dev158"
2+
#define DUCKDB_PATCH_VERSION "3-dev165"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 1
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.1.3-dev158"
11+
#define DUCKDB_VERSION "v1.1.3-dev165"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "c3ca3607c2"
14+
#define DUCKDB_SOURCE_ID "19864453f7"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/planner/binder/expression/bind_macro_expression.cpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "duckdb/catalog/catalog_entry/scalar_macro_catalog_entry.hpp"
2+
#include "duckdb/common/enums/expression_type.hpp"
23
#include "duckdb/common/reference_map.hpp"
34
#include "duckdb/common/string_util.hpp"
45
#include "duckdb/function/scalar_macro_function.hpp"
@@ -26,12 +27,8 @@ void ExpressionBinder::ReplaceMacroParametersInLambda(FunctionExpression &functi
2627

2728
if (!error_message.empty()) {
2829
// Possibly a JSON function, replace both LHS and RHS.
29-
ParsedExpressionIterator::EnumerateChildren(*lambda_expr.lhs, [&](unique_ptr<ParsedExpression> &child) {
30-
ReplaceMacroParameters(child, lambda_params);
31-
});
32-
ParsedExpressionIterator::EnumerateChildren(*lambda_expr.expr, [&](unique_ptr<ParsedExpression> &child) {
33-
ReplaceMacroParameters(child, lambda_params);
34-
});
30+
ReplaceMacroParameters(lambda_expr.lhs, lambda_params);
31+
ReplaceMacroParameters(lambda_expr.expr, lambda_params);
3532
continue;
3633
}
3734

@@ -43,9 +40,7 @@ void ExpressionBinder::ReplaceMacroParametersInLambda(FunctionExpression &functi
4340
}
4441

4542
// Only replace in the RHS of the expression.
46-
ParsedExpressionIterator::EnumerateChildren(*lambda_expr.expr, [&](unique_ptr<ParsedExpression> &child) {
47-
ReplaceMacroParameters(child, lambda_params);
48-
});
43+
ReplaceMacroParameters(lambda_expr.expr, lambda_params);
4944

5045
lambda_params.pop_back();
5146
}

0 commit comments

Comments
 (0)