Skip to content

Commit 9198770

Browse files
committed
chore: Update vendored sources to duckdb/duckdb@bf050db
Merge pull request duckdb/duckdb#11316 from Mytherin/issue11293
1 parent 2d2e418 commit 9198770

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
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 "2-dev156"
2+
#define DUCKDB_PATCH_VERSION "2-dev158"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 10
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 0
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v0.10.2-dev156"
11+
#define DUCKDB_VERSION "v0.10.2-dev158"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "ef62c27528"
14+
#define DUCKDB_SOURCE_ID "bf050db984"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/parser/transform/expression/transform_subquery.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ unique_ptr<ParsedExpression> Transformer::TransformSubquery(duckdb_libpgquery::P
6969
vector<unique_ptr<ParsedExpression>> children;
7070
children.push_back(std::move(columns_star));
7171
auto aggr = make_uniq<FunctionExpression>("array_agg", std::move(children));
72+
for (auto &modifier : subquery_expr->subquery->node->modifiers) {
73+
if (modifier->type == ResultModifierType::ORDER_MODIFIER) {
74+
aggr->order_bys = unique_ptr_cast<ResultModifier, OrderModifier>(modifier->Copy());
75+
break;
76+
}
77+
}
7278
// ARRAY_AGG(COLUMNS(*)) IS NULL
7379
auto agg_is_null = make_uniq<OperatorExpression>(ExpressionType::OPERATOR_IS_NULL, aggr->Copy());
7480
// empty list

0 commit comments

Comments
 (0)