From 1bd9a4be6b4c380ae1cac7f2781d41876113e258 Mon Sep 17 00:00:00 2001 From: DuckDB Labs GitHub Bot Date: Sun, 3 Nov 2024 00:36:45 +0000 Subject: [PATCH] Update vendored DuckDB sources to 8307ca4e --- .../src/function/table/version/pragma_version.cpp | 6 +++--- .../binder/expression/bind_macro_expression.cpp | 13 ++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp index 36cd6d64..f1f4ecf1 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 "3-dev158" +#define DUCKDB_PATCH_VERSION "3-dev165" #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.3-dev158" +#define DUCKDB_VERSION "v1.1.3-dev165" #endif #ifndef DUCKDB_SOURCE_ID -#define DUCKDB_SOURCE_ID "c3ca3607c2" +#define DUCKDB_SOURCE_ID "19864453f7" #endif #include "duckdb/function/table/system_functions.hpp" #include "duckdb/main/database.hpp" diff --git a/src/duckdb/src/planner/binder/expression/bind_macro_expression.cpp b/src/duckdb/src/planner/binder/expression/bind_macro_expression.cpp index caa6ba77..358dd5db 100644 --- a/src/duckdb/src/planner/binder/expression/bind_macro_expression.cpp +++ b/src/duckdb/src/planner/binder/expression/bind_macro_expression.cpp @@ -1,4 +1,5 @@ #include "duckdb/catalog/catalog_entry/scalar_macro_catalog_entry.hpp" +#include "duckdb/common/enums/expression_type.hpp" #include "duckdb/common/reference_map.hpp" #include "duckdb/common/string_util.hpp" #include "duckdb/function/scalar_macro_function.hpp" @@ -26,12 +27,8 @@ void ExpressionBinder::ReplaceMacroParametersInLambda(FunctionExpression &functi if (!error_message.empty()) { // Possibly a JSON function, replace both LHS and RHS. - ParsedExpressionIterator::EnumerateChildren(*lambda_expr.lhs, [&](unique_ptr &child) { - ReplaceMacroParameters(child, lambda_params); - }); - ParsedExpressionIterator::EnumerateChildren(*lambda_expr.expr, [&](unique_ptr &child) { - ReplaceMacroParameters(child, lambda_params); - }); + ReplaceMacroParameters(lambda_expr.lhs, lambda_params); + ReplaceMacroParameters(lambda_expr.expr, lambda_params); continue; } @@ -43,9 +40,7 @@ void ExpressionBinder::ReplaceMacroParametersInLambda(FunctionExpression &functi } // Only replace in the RHS of the expression. - ParsedExpressionIterator::EnumerateChildren(*lambda_expr.expr, [&](unique_ptr &child) { - ReplaceMacroParameters(child, lambda_params); - }); + ReplaceMacroParameters(lambda_expr.expr, lambda_params); lambda_params.pop_back(); }