Skip to content

Commit f017044

Browse files
authored
Merge branch 'main' into copilot/fix-quantile-translation-error
2 parents 09f0030 + 43ec892 commit f017044

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

R/version.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated by rconfigure.py, do not edit by hand
22
# DuckDB version information
33

4-
duckdb_version <- "1.4.3-dev4"
4+
duckdb_version <- "1.4.3-dev8"
55

66
# Function to get DuckDB version without establishing a connection
77
get_duckdb_version <- function() {

src/duckdb/src/execution/physical_plan/plan_filter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ PhysicalOperator &PhysicalPlanGenerator::CreatePlan(LogicalFilter &op) {
1414
D_ASSERT(op.children.size() == 1);
1515
reference<PhysicalOperator> plan = CreatePlan(*op.children[0]);
1616
if (!op.expressions.empty()) {
17-
D_ASSERT(!plan.get().GetTypes().empty());
1817
// create a filter if there is anything to filter
1918
auto &filter = Make<PhysicalFilter>(plan.get().GetTypes(), std::move(op.expressions), op.estimated_cardinality);
2019
filter.children.push_back(plan);

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-dev4"
2+
#define DUCKDB_PATCH_VERSION "3-dev8"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 4
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.4.3-dev4"
11+
#define DUCKDB_VERSION "v1.4.3-dev8"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "0efe5ccb5b"
14+
#define DUCKDB_SOURCE_ID "5f0c38c5eb"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/planner/binder/query_node/plan_select_node.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ unique_ptr<LogicalOperator> Binder::CreatePlan(BoundSelectNode &statement) {
3030
root = PlanFilter(std::move(statement.where_clause), std::move(root));
3131
}
3232

33-
if (!statement.aggregates.empty() || !statement.groups.group_expressions.empty()) {
33+
if (!statement.aggregates.empty() || !statement.groups.group_expressions.empty() || statement.having) {
3434
if (!statement.groups.group_expressions.empty()) {
3535
// visit the groups
3636
for (auto &group : statement.groups.group_expressions) {

0 commit comments

Comments
 (0)