Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@e5e1595 (#421)
Browse files Browse the repository at this point in the history
Fix duckdb/duckdb#13585 - transform from or select first based on order specified by the user (duckdb/duckdb#13959)
Increment julia version (duckdb/duckdb#13966)

Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and krlmlr authored Sep 25, 2024
1 parent b1efaab commit 83b9265
Show file tree
Hide file tree
Showing 4 changed files with 813 additions and 805 deletions.
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-dev132"
#define DUCKDB_PATCH_VERSION "1-dev136"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 1
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.1.1-dev132"
#define DUCKDB_VERSION "v1.1.1-dev136"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "75d4bd0cc7"
#define DUCKDB_SOURCE_ID "e5e1595da7"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,14 @@ unique_ptr<QueryNode> Transformer::TransformSelectInternal(duckdb_libpgquery::PG
if (!stmt.targetList) {
throw ParserException("SELECT clause without selection list");
}
// select list
TransformExpressionList(*stmt.targetList, result.select_list);
result.from_table = TransformFrom(stmt.fromClause);
// transform in the specified order to ensure positional parameters are correctly set
if (stmt.from_first) {
result.from_table = TransformFrom(stmt.fromClause);
TransformExpressionList(*stmt.targetList, result.select_list);
} else {
TransformExpressionList(*stmt.targetList, result.select_list);
result.from_table = TransformFrom(stmt.fromClause);
}
}

// where
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1287,6 +1287,7 @@ typedef struct PGSelectStmt {
*/
PGSetOperation op; /* type of set op */
bool all; /* ALL specified? */
bool from_first; /* FROM first or SELECT first */
struct PGNode *larg; /* left child */
struct PGNode *rarg; /* right child */
/* Eventually add fields for CORRESPONDING spec here */
Expand Down
Loading

0 comments on commit 83b9265

Please sign in to comment.