Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support postgresql 14 #266

Closed
wants to merge 14 commits into from
Closed

Support postgresql 14 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e731cd2
support Cardinality type
Leo-XM-Zeng Oct 9, 2024
198cfd2
Add unmodified ruleutils source files from PG14
Leo-XM-Zeng Oct 9, 2024
6df86c6
Add restrictions on the pg14 version
Leo-XM-Zeng Oct 9, 2024
60f192e
Supports successful creation of pg_duckdb extensions on PG14
Leo-XM-Zeng Oct 9, 2024
2583075
Consistent handling with other PG versions, keeping the style uniform
Leo-XM-Zeng Oct 9, 2024
242c01f
Use more general psql features
Leo-XM-Zeng Oct 9, 2024
f8e0ccf
Example Add CI information about PG14
Leo-XM-Zeng Oct 9, 2024
5173fb3
Merge branch 'main' of github.com:Leo-XM-Zeng/pg_duckdb into pg_duckd…
Leo-XM-Zeng Oct 9, 2024
1dc7679
Adjust the section about testing temporary tables
Leo-XM-Zeng Oct 10, 2024
9acaa7f
Merge branch 'main' of github.com:Leo-XM-Zeng/pg_duckdb into pg_duckd…
Leo-XM-Zeng Oct 10, 2024
a330416
adjust the format
Leo-XM-Zeng Oct 10, 2024
fe0850b
Merge branch 'main' of github.com:Leo-XM-Zeng/pg_duckdb into pg_duckd…
Leo-XM-Zeng Oct 24, 2024
bc40491
Change to a function method name that better matches the content of t…
Leo-XM-Zeng Oct 29, 2024
78aabc8
Merge branch 'main' into pg_duckdb_14
Leo-XM-Zeng Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [REL_15_STABLE, REL_16_STABLE, REL_17_STABLE]
version: [REL_14_STABLE, REL_15_STABLE, REL_16_STABLE, REL_17_STABLE]
runs-on: ubuntu-24.04

steps:
Expand Down
4 changes: 4 additions & 0 deletions include/pgduckdb/catalog/pgduckdb_table.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ extern "C" {
#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "access/htup_details.h"

#if PG_VERSION_NUM < 150000
typedef double Cardinality;
#endif
}

namespace duckdb {
Expand Down
6 changes: 5 additions & 1 deletion src/utility/copy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ CreateCopyOptions(CopyStmt *copy_stmt, bool *options_valid) {
switch (nodeTag(defel->arg)) {
case T_Integer:
case T_Float:
case T_Boolean:
case T_BooleanTest:
options_string += defGetString(defel);
break;
case T_String:
Expand Down Expand Up @@ -231,7 +231,11 @@ DuckdbCopy(PlannedStmt *pstmt, const char *query_string, struct QueryEnvironment
raw_stmt->stmt_location = pstmt->stmt_location;
raw_stmt->stmt_len = pstmt->stmt_len;

#if PG_VERSION_NUM >= 150000
List *rewritten = pg_analyze_and_rewrite_fixedparams(raw_stmt, query_string, NULL, 0, NULL);
#else
List *rewritten = pg_analyze_and_rewrite(raw_stmt, query_string, NULL, 0, NULL);
#endif
CheckRewritten(rewritten);

Query *query = linitial_node(Query, rewritten);
Expand Down
Loading