Skip to content

[PGPRO-14880] Fix tests for PostgreSQL 18 #161

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

Merged
merged 3 commits into from
Oct 2, 2025
Merged

[PGPRO-14880] Fix tests for PostgreSQL 18 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4ddc0c
[PGPRO-14880] Fix a bunch of tests due to EXPLAIN's oupiut changing
Sep 4, 2025
5bda640
[PGPRO-14880] Fix sequrity test due to changes in reporting of errors
Sep 4, 2025
bf9edef
Revert "PGPRO-12044, PGPRO-14880: temporarily disable some regression…
Sep 5, 2025
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
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ RELATIVE_INCLUDES = $(addprefix src/, $(INCLUDES))

LDFLAGS_SL += $(filter -lm, $(LIBS))

REGRESS = rum rum_validate rum_hash ruminv timestamp \
orderby orderby_hash limits \
int2 int4 float4 float8 money oid \
REGRESS = security rum rum_validate rum_hash ruminv timestamp \
orderby orderby_hash altorder altorder_hash limits \
int2 int4 int8 float4 float8 money oid \
time timetz date interval \
macaddr inet cidr varchar char bytea bit varbit \
numeric rum_weight expr
macaddr inet cidr text varchar char bytea bit varbit \
numeric rum_weight expr array

TAP_TESTS = 1

Expand Down
4 changes: 2 additions & 2 deletions expected/altorder.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* altorder.out - test output for 64-bit systems
* altorder_1.out - test output for 32-bit systems
*
* Since c01743aa486 (>=18) EXPLAIN output was changed,
* now it includes the number of disabled nodes
* Since c01743aa486 and 161320b4b96 (>=18) EXPLAIN output was changed,
* now it shows whether nodes are disabled.
*
* altorder_2.out - test output for 32-bit systems (>=18)
*
Expand Down
4 changes: 2 additions & 2 deletions expected/altorder_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* altorder.out - test output for 64-bit systems
* altorder_1.out - test output for 32-bit systems
*
* Since c01743aa486 (>=18) EXPLAIN output was changed,
* now it includes the number of disabled nodes
* Since c01743aa486 and 161320b4b96 (>=18) EXPLAIN output was changed,
* now it shows whether nodes are disabled.
*
* altorder_2.out - test output for 32-bit systems (>=18)
*
Expand Down
58 changes: 22 additions & 36 deletions expected/altorder_2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* altorder.out - test output for 64-bit systems
* altorder_1.out - test output for 32-bit systems
*
* Since c01743aa486 (>=18) EXPLAIN output was changed,
* now it includes the number of disabled nodes
* Since c01743aa486 and 161320b4b96 (>=18) EXPLAIN output was changed,
* now it shows whether nodes are disabled.
*
* altorder_2.out - test output for 32-bit systems (>=18)
*
Expand Down Expand Up @@ -190,11 +190,10 @@ SELECT count(*) FROM atsts WHERE t @@ 'wr|qh';
QUERY PLAN
---------------------------------------------------
Aggregate
Disabled Nodes: 1
-> Seq Scan on atsts
Disabled Nodes: 1
Disabled: true
Filter: (t @@ '''wr'' | ''qh'''::tsquery)
(5 rows)
(4 rows)

SELECT count(*) FROM atsts WHERE t @@ 'wr|qh';
count
Expand Down Expand Up @@ -237,11 +236,10 @@ SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
QUERY PLAN
-------------------------------------------------------------------------------
Aggregate
Disabled Nodes: 1
-> Seq Scan on atsts
Disabled Nodes: 1
Disabled: true
Filter: (d < 'Mon May 16 14:21:25 2016'::timestamp without time zone)
(5 rows)
(4 rows)

SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
count
Expand All @@ -254,11 +252,10 @@ SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
QUERY PLAN
-------------------------------------------------------------------------------
Aggregate
Disabled Nodes: 1
-> Seq Scan on atsts
Disabled Nodes: 1
Disabled: true
Filter: (d > 'Mon May 16 14:21:25 2016'::timestamp without time zone)
(5 rows)
(4 rows)

SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
count
Expand All @@ -275,14 +272,12 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
QUERY PLAN
-------------------------------------------------------------------------------------
Limit
Disabled Nodes: 1
-> Sort
Disabled Nodes: 1
Sort Key: ((d <=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
-> Seq Scan on atsts
Disabled Nodes: 1
Disabled: true
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
(8 rows)
(6 rows)

SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
id | d | ?column?
Expand All @@ -299,14 +294,12 @@ SELECT id, d, d <=| '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
QUERY PLAN
-------------------------------------------------------------------------------------
Limit
Disabled Nodes: 1
-> Sort
Disabled Nodes: 1
Sort Key: ((d <=| 'Mon May 16 14:21:25 2016'::timestamp without time zone))
-> Seq Scan on atsts
Disabled Nodes: 1
Disabled: true
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
(8 rows)
(6 rows)

SELECT id, d, d <=| '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d <=| '2016-05-16 14:21:25' LIMIT 5;
id | d | ?column?
Expand All @@ -323,14 +316,12 @@ SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
QUERY PLAN
-------------------------------------------------------------------------------------
Limit
Disabled Nodes: 1
-> Sort
Disabled Nodes: 1
Sort Key: ((d |=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
-> Seq Scan on atsts
Disabled Nodes: 1
Disabled: true
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
(8 rows)
(6 rows)

SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d |=> '2016-05-16 14:21:25' LIMIT 5;
id | d | ?column?
Expand All @@ -347,13 +338,11 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts ORDER BY d <=> '2016-05-16
QUERY PLAN
-------------------------------------------------------------------------------------
Limit
Disabled Nodes: 1
-> Sort
Disabled Nodes: 1
Sort Key: ((d <=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
-> Seq Scan on atsts
Disabled Nodes: 1
(7 rows)
Disabled: true
(5 rows)

SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
id | d | ?column?
Expand All @@ -370,12 +359,11 @@ SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER
QUERY PLAN
------------------------------------------------------------------------------------------------------------------------
Sort
Disabled Nodes: 1
Sort Key: d
-> Seq Scan on atsts
Disabled Nodes: 1
Disabled: true
Filter: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d <= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
(6 rows)
(5 rows)

SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
id | d
Expand Down Expand Up @@ -423,12 +411,11 @@ SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER
QUERY PLAN
------------------------------------------------------------------------------------------------------------------------
Sort
Disabled Nodes: 1
Sort Key: d
-> Seq Scan on atsts
Disabled Nodes: 1
Disabled: true
Filter: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d >= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
(6 rows)
(5 rows)

SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
id | d
Expand Down Expand Up @@ -472,12 +459,11 @@ SELECT id, d FROM atsts WHERE t @@ 'wr&q:*' AND d >= '2016-05-16 14:21:25' ORDE
QUERY PLAN
-------------------------------------------------------------------------------------------------------------------------
Sort
Disabled Nodes: 1
Sort Key: d
-> Seq Scan on atsts
Disabled Nodes: 1
Disabled: true
Filter: ((t @@ '''wr'' & ''q'':*'::tsquery) AND (d >= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
(6 rows)
(5 rows)

SELECT id, d FROM atsts WHERE t @@ 'wr&q:*' AND d >= '2016-05-16 14:21:25' ORDER BY d;
id | d
Expand Down
4 changes: 2 additions & 2 deletions expected/altorder_hash.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* altorder_hash.out - test output for 64-bit systems and
* altorder_hash_1.out - test output for 32-bit systems.
*
* Since c01743aa486 (>=18) EXPLAIN output was changed,
* now it includes the number of disabled nodes
* Since c01743aa486 and 161320b4b96 (>=18) EXPLAIN output was changed,
* now it shows whether nodes are disabled.
*
* altorder_hash_2.out - test output for 32-bit systems (>=18)
*
Expand Down
4 changes: 2 additions & 2 deletions expected/altorder_hash_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* altorder_hash.out - test output for 64-bit systems and
* altorder_hash_1.out - test output for 32-bit systems.
*
* Since c01743aa486 (>=18) EXPLAIN output was changed,
* now it includes the number of disabled nodes
* Since c01743aa486 and 161320b4b96 (>=18) EXPLAIN output was changed,
* now it shows whether nodes are disabled.
*
* altorder_hash_2.out - test output for 32-bit systems (>=18)
*
Expand Down
53 changes: 20 additions & 33 deletions expected/altorder_hash_2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* altorder_hash.out - test output for 64-bit systems and
* altorder_hash_1.out - test output for 32-bit systems.
*
* Since c01743aa486 (>=18) EXPLAIN output was changed,
* now it includes the number of disabled nodes
* Since c01743aa486 and 161320b4b96 (>=18) EXPLAIN output was changed,
* now it shows whether nodes are disabled.
*
* altorder_hash_2.out - test output for 32-bit systems (>=18)
*
Expand Down Expand Up @@ -135,11 +135,10 @@ SELECT count(*) FROM atstsh WHERE t @@ 'wr|qh';
QUERY PLAN
---------------------------------------------------
Aggregate
Disabled Nodes: 1
-> Seq Scan on atstsh
Disabled Nodes: 1
Disabled: true
Filter: (t @@ '''wr'' | ''qh'''::tsquery)
(5 rows)
(4 rows)

SELECT count(*) FROM atstsh WHERE t @@ 'wr|qh';
count
Expand Down Expand Up @@ -182,11 +181,10 @@ SELECT count(*) FROM atstsh WHERE d < '2016-05-16 14:21:25';
QUERY PLAN
-------------------------------------------------------------------------------
Aggregate
Disabled Nodes: 1
-> Seq Scan on atstsh
Disabled Nodes: 1
Disabled: true
Filter: (d < 'Mon May 16 14:21:25 2016'::timestamp without time zone)
(5 rows)
(4 rows)

SELECT count(*) FROM atstsh WHERE d < '2016-05-16 14:21:25';
count
Expand All @@ -199,11 +197,10 @@ SELECT count(*) FROM atstsh WHERE d > '2016-05-16 14:21:25';
QUERY PLAN
-------------------------------------------------------------------------------
Aggregate
Disabled Nodes: 1
-> Seq Scan on atstsh
Disabled Nodes: 1
Disabled: true
Filter: (d > 'Mon May 16 14:21:25 2016'::timestamp without time zone)
(5 rows)
(4 rows)

SELECT count(*) FROM atstsh WHERE d > '2016-05-16 14:21:25';
count
Expand All @@ -220,14 +217,12 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER B
QUERY PLAN
-------------------------------------------------------------------------------------
Limit
Disabled Nodes: 1
-> Sort
Disabled Nodes: 1
Sort Key: ((d <=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
-> Seq Scan on atstsh
Disabled Nodes: 1
Disabled: true
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
(8 rows)
(6 rows)

SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
id | d | ?column?
Expand All @@ -244,14 +239,12 @@ SELECT id, d, d <=| '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER B
QUERY PLAN
-------------------------------------------------------------------------------------
Limit
Disabled Nodes: 1
-> Sort
Disabled Nodes: 1
Sort Key: ((d <=| 'Mon May 16 14:21:25 2016'::timestamp without time zone))
-> Seq Scan on atstsh
Disabled Nodes: 1
Disabled: true
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
(8 rows)
(6 rows)

SELECT id, d, d <=| '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER BY d <=| '2016-05-16 14:21:25' LIMIT 5;
id | d | ?column?
Expand All @@ -268,14 +261,12 @@ SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER B
QUERY PLAN
-------------------------------------------------------------------------------------
Limit
Disabled Nodes: 1
-> Sort
Disabled Nodes: 1
Sort Key: ((d |=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
-> Seq Scan on atstsh
Disabled Nodes: 1
Disabled: true
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
(8 rows)
(6 rows)

SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER BY d |=> '2016-05-16 14:21:25' LIMIT 5;
id | d | ?column?
Expand All @@ -292,13 +283,11 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atstsh ORDER BY d <=> '2016-05-16
QUERY PLAN
-------------------------------------------------------------------------------------
Limit
Disabled Nodes: 1
-> Sort
Disabled Nodes: 1
Sort Key: ((d <=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
-> Seq Scan on atstsh
Disabled Nodes: 1
(7 rows)
Disabled: true
(5 rows)

SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atstsh ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
id | d | ?column?
Expand All @@ -315,12 +304,11 @@ SELECT id, d FROM atstsh WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDE
QUERY PLAN
------------------------------------------------------------------------------------------------------------------------
Sort
Disabled Nodes: 1
Sort Key: d
-> Seq Scan on atstsh
Disabled Nodes: 1
Disabled: true
Filter: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d <= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
(6 rows)
(5 rows)

SELECT id, d FROM atstsh WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
id | d
Expand All @@ -341,12 +329,11 @@ SELECT id, d FROM atstsh WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDE
QUERY PLAN
------------------------------------------------------------------------------------------------------------------------
Sort
Disabled Nodes: 1
Sort Key: d
-> Seq Scan on atstsh
Disabled Nodes: 1
Disabled: true
Filter: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d >= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
(6 rows)
(5 rows)

SELECT id, d FROM atstsh WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
id | d
Expand Down
4 changes: 2 additions & 2 deletions expected/array.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* array.out - test output for 64-bit systems and
* array_1.out - test output for 32-bit systems.
*
* Since c01743aa486 (>=18) EXPLAIN output was changed,
* now it includes the number of disabled nodes
* Since c01743aa486 and 161320b4b96 (>=18) EXPLAIN output was changed,
* now it shows whether nodes are disabled.
*
* array_2.out - test output for 64-bit systems (>=18).
* array_3.out - test output for 32-bit systems (>=18).
Expand Down
4 changes: 2 additions & 2 deletions expected/array_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* array.out - test output for 64-bit systems and
* array_1.out - test output for 32-bit systems.
*
* Since c01743aa486 (>=18) EXPLAIN output was changed,
* now it includes the number of disabled nodes
* Since c01743aa486 and 161320b4b96 (>=18) EXPLAIN output was changed,
* now it shows whether nodes are disabled.
*
* array_2.out - test output for 64-bit systems (>=18).
* array_3.out - test output for 32-bit systems (>=18).
Expand Down
Loading