Skip to content

Commit 0b54f70

Browse files
committed
[PGPRO-6734] PostgreSQL v15 compatibility
1 parent 73e3a35 commit 0b54f70

11 files changed

+620
-69
lines changed

.travis.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ notifications:
2020
on_failure: always
2121

2222
env:
23+
- PG_VERSION=14 LEVEL=hardcore
24+
- PG_VERSION=14
2325
- PG_VERSION=13 LEVEL=hardcore
2426
- PG_VERSION=13
2527
- PG_VERSION=12 LEVEL=hardcore
@@ -28,12 +30,7 @@ env:
2830
- PG_VERSION=11
2931
- PG_VERSION=10 LEVEL=hardcore
3032
- PG_VERSION=10
31-
- PG_VERSION=9.6 LEVEL=hardcore
32-
- PG_VERSION=9.6
33-
- PG_VERSION=9.5 LEVEL=hardcore
34-
- PG_VERSION=9.5
3533

3634
jobs:
3735
allow_failures:
3836
- env: PG_VERSION=10 LEVEL=nightmare
39-
- env: PG_VERSION=9.6 LEVEL=nightmare

Dockerfile.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM postgres:${PG_VERSION}-alpine
22

33
# Install dependencies
44
RUN apk add --no-cache \
5-
openssl curl \
5+
openssl curl git patch \
66
cmocka-dev \
77
perl perl-ipc-run \
88
python3 python3-dev py3-virtualenv \

patches/REL_14_STABLE-pg_pathman-core.diff

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ index 5483dee650..e2864e6ae9 100644
3333
out:
3434
+
3535
+ /*
36-
+ * pg_pathman: pass 'tts_tableOid' to result tuple for determine from
37-
+ * which partition the touple was read
36+
+ * pg_pathman: pass 'tts_tableOid' to result tuple to determine from
37+
+ * which partition the tuple was read
3838
+ */
3939
+ if (resultslot)
4040
+ {
@@ -111,7 +111,7 @@ index d328856ae5..27235ec869 100644
111111
for (;;)
112112
{
113113
+ /*
114-
+ * "es_original_tuple" should contains original modified tuple (new
114+
+ * "es_original_tuple" should contain original modified tuple (new
115115
+ * values of the changed columns plus row identity information such as
116116
+ * CTID) in case tuple planSlot is replaced in pg_pathman to new value
117117
+ * in call "ExecProcNode(subplanstate)".
@@ -312,7 +312,7 @@ index 381d9e548d..9d101c3a86 100644
312312

313313

314314
-ProtocolVersion FrontendProtocol;
315-
+ProtocolVersion FrontendProtocol = (ProtocolVersion)0;
315+
+ProtocolVersion FrontendProtocol = (ProtocolVersion) 0;
316316

317317
volatile sig_atomic_t InterruptPending = false;
318318
volatile sig_atomic_t QueryCancelPending = false;

0 commit comments

Comments
 (0)