PostgreSQL Patch Tester

Current commitfest | Next commitfest | FAQ | Statistics | Highlights

Highlight type: all assertion compiler core linker panic regress sanitizer tap test

Time range: current 7-day 30-day 90-day

This robot generates gigabytes of CI logs every week. Here is an attempt to search for "highlights", so it's easier to find actionable information quickly. New ideas for what patterns to search for are very welcome. "Current" shows only the most recent results from each submission. The wider time ranges also show information about historical versions, which may be useful for flapping tests, and also for hunting for bugs in master.

59/6543 synchronized_standby_slots behavior inconsistent with quorum-based synchronous replication
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/modules/unsafe_tests/expected/guc_privs.out /Users/admin/pgsql/build/testrun/unsafe...
--- /Users/admin/pgsql/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-13 12:05:52
+++ /Users/admin/pgsql/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-13 12:12:03
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out /tmp/cirrus-ci-build/build/testrun/un...
--- /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-13 12:05:49.413169480 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-13 12:12:03.327390008 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/modules/unsafe_tests/expected/guc_privs.out C:/cirrus/build/testrun/unsa...
--- C:/cirrus/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-13 12:05:52.797512500 +0000
+++ C:/cirrus/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-13 12:17:14.109833100 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out /tmp/cirrus-ci-build/src/test/modules...
--- /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-13 12:05:58.015193935 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/results/guc_privs.out	2026-05-13 12:14:34.989244911 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/modules/unsafe_tests/expected/guc_privs.out /home/postgres/postgres/build/test...
--- /home/postgres/postgres/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-13 12:06:10.561496066 +0000
+++ /home/postgres/postgres/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-13 12:09:37.781565788 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/modules/unsafe_tests/expected/guc_privs.out /home/postgres/postgres/build/test...
--- /home/postgres/postgres/src/test/modules/unsafe_tests/expected/guc_privs.out	Wed May 13 12:05:59 2026
+++ /home/postgres/postgres/build/testrun/unsafe_tests/regress/results/guc_privs.out	Wed May 13 12:12:44 2026
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out /tmp/cirrus-ci-build/build/testrun/un...
--- /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-13 12:05:47.235751000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-13 12:11:14.920432000 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC
59/6751 [PATCH] Make NumericVar storage semantics explicit
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/numeric_op_big.out /home/postgres/postgres/build/testrun/regr...
--- /home/postgres/postgres/src/test/regress/expected/numeric_op_big.out	Tue May 12 22:31:51 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/numeric_op_big.out	Tue May 12 22:36:04 2026
@@ -257,11 +257,15 @@
 (6 rows)
 
 explain (costs off) select a from t_1000_1000 where a > 1000 order by a;
-                      QUERY PLAN                      
-------------------------------------------------------
- Index Only Scan using idx_t_1000_1000 on t_1000_1000
-   Index Cond: (a > '1000'::numeric)
-(2 rows)
+                    QUERY PLAN                    
+--------------------------------------------------
+ Sort
+   Sort Key: a
+   ->  Bitmap Heap Scan on t_1000_1000
+         Recheck Cond: (a > '1000'::numeric)
+         ->  Bitmap Index Scan on idx_t_1000_1000
+               Index Cond: (a > '1000'::numeric)
...
59/6763 Improve pg_stat_statements scalability
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/contrib/pg_stat_statements/expected/select.out C:/cirrus/build/testrun/pg_stat_st...
--- C:/cirrus/contrib/pg_stat_statements/expected/select.out	2026-05-12 14:52:28.601029600 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/select.out	2026-05-12 15:03:18.608385200 +0000
@@ -206,686 +206,7 @@
 
 DEALLOCATE pgss_test;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
- calls | rows |                                    query                                     
--------+------+------------------------------------------------------------------------------
-     1 |    1 | PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3
-     4 |    4 | SELECT $1                                                                   +
-       |      |   -- but this one will appear                                               +
-       |      |   AS "text"
-     2 |    2 | SELECT $1 + $2
-     3 |    3 | SELECT $1 + $2 + $3 AS "add"
-     1 |    1 | SELECT $1 AS "float"
-     2 |    2 | SELECT $1 AS "int"
-     2 |    2 | SELECT $1 AS "int" LIMIT $2
-     2 |    0 | SELECT $1 AS "int" OFFSET $2
-     6 |    0 | SELECT $1 AS "int" OFFSET $2 LIMIT $3
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/contrib/pg_stat_statements/expected/select.out /Users/admin/pgsql/build/testrun/pg_stat_stat...
--- /Users/admin/pgsql/contrib/pg_stat_statements/expected/select.out	2026-05-12 14:52:14
+++ /Users/admin/pgsql/build/testrun/pg_stat_statements/regress/results/select.out	2026-05-12 15:02:22
@@ -206,686 +206,7 @@
 
 DEALLOCATE pgss_test;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
- calls | rows |                                    query                                     
--------+------+------------------------------------------------------------------------------
-     1 |    1 | PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3
-     4 |    4 | SELECT $1                                                                   +
-       |      |   -- but this one will appear                                               +
-       |      |   AS "text"
-     2 |    2 | SELECT $1 + $2
-     3 |    3 | SELECT $1 + $2 + $3 AS "add"
-     1 |    1 | SELECT $1 AS "float"
-     2 |    2 | SELECT $1 AS "int"
-     2 |    2 | SELECT $1 AS "int" LIMIT $2
-     2 |    0 | SELECT $1 AS "int" OFFSET $2
-     6 |    0 | SELECT $1 AS "int" OFFSET $2 LIMIT $3
...
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out /tmp/cirrus-ci-build/build/testrun/pg_stat_...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out	2026-05-12 14:52:21.693383547 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/select.out	2026-05-12 14:59:25.638652370 +0000
@@ -206,686 +206,7 @@
 
 DEALLOCATE pgss_test;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
- calls | rows |                                    query                                     
--------+------+------------------------------------------------------------------------------
-     1 |    1 | PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3
-     4 |    4 | SELECT $1                                                                   +
-       |      |   -- but this one will appear                                               +
-       |      |   AS "text"
-     2 |    2 | SELECT $1 + $2
-     3 |    3 | SELECT $1 + $2 + $3 AS "add"
-     1 |    1 | SELECT $1 AS "float"
-     2 |    2 | SELECT $1 AS "int"
-     2 |    2 | SELECT $1 AS "int" LIMIT $2
-     2 |    0 | SELECT $1 AS "int" OFFSET $2
-     6 |    0 | SELECT $1 AS "int" OFFSET $2 LIMIT $3
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/contrib/pg_stat_statements/expected/select.out /home/postgres/postgres/build/testrun/pg...
--- /home/postgres/postgres/contrib/pg_stat_statements/expected/select.out	2026-05-12 14:52:21.112171814 +0000
+++ /home/postgres/postgres/build/testrun/pg_stat_statements/regress/results/select.out	2026-05-12 14:57:06.119755866 +0...
@@ -206,686 +206,7 @@
 
 DEALLOCATE pgss_test;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
- calls | rows |                                    query                                     
--------+------+------------------------------------------------------------------------------
-     1 |    1 | PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3
-     4 |    4 | SELECT $1                                                                   +
-       |      |   -- but this one will appear                                               +
-       |      |   AS "text"
-     2 |    2 | SELECT $1 + $2
-     3 |    3 | SELECT $1 + $2 + $3 AS "add"
-     1 |    1 | SELECT $1 AS "float"
-     2 |    2 | SELECT $1 AS "int"
-     2 |    2 | SELECT $1 AS "int" LIMIT $2
-     2 |    0 | SELECT $1 AS "int" OFFSET $2
-     6 |    0 | SELECT $1 AS "int" OFFSET $2 LIMIT $3
...
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/contrib/pg_stat_statements/expected/select.out /home/postgres/postgres/build/testrun/pg...
--- /home/postgres/postgres/contrib/pg_stat_statements/expected/select.out	Tue May 12 14:52:23 2026
+++ /home/postgres/postgres/build/testrun/pg_stat_statements/regress/results/select.out	Tue May 12 15:00:58 2026
@@ -206,686 +206,7 @@
 
 DEALLOCATE pgss_test;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
- calls | rows |                                    query                                     
--------+------+------------------------------------------------------------------------------
-     1 |    1 | PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3
-     4 |    4 | SELECT $1                                                                   +
-       |      |   -- but this one will appear                                               +
-       |      |   AS "text"
-     2 |    2 | SELECT $1 + $2
-     3 |    3 | SELECT $1 + $2 + $3 AS "add"
-     1 |    1 | SELECT $1 AS "float"
-     2 |    2 | SELECT $1 AS "int"
-     2 |    2 | SELECT $1 AS "int" LIMIT $2
-     2 |    0 | SELECT $1 AS "int" OFFSET $2
-     6 |    0 | SELECT $1 AS "int" OFFSET $2 LIMIT $3
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out /tmp/cirrus-ci-build/contrib/pg_stat_statem...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out	2026-05-12 14:52:22.731058598 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/select.out	2026-05-12 14:59:46.221838923 +0000
@@ -206,686 +206,7 @@
 
 DEALLOCATE pgss_test;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
- calls | rows |                                    query                                     
--------+------+------------------------------------------------------------------------------
-     1 |    1 | PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3
-     4 |    4 | SELECT $1                                                                   +
-       |      |   -- but this one will appear                                               +
-       |      |   AS "text"
-     2 |    2 | SELECT $1 + $2
-     3 |    3 | SELECT $1 + $2 + $3 AS "add"
-     1 |    1 | SELECT $1 AS "float"
-     2 |    2 | SELECT $1 AS "int"
-     2 |    2 | SELECT $1 AS "int" LIMIT $2
-     2 |    0 | SELECT $1 AS "int" OFFSET $2
-     6 |    0 | SELECT $1 AS "int" OFFSET $2 LIMIT $3
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out /tmp/cirrus-ci-build/build/testrun/pg_stat_...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out	2026-05-12 14:52:21.426685000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/select.out	2026-05-12 14:57:06.994685000 +0000
@@ -206,686 +206,10 @@
 
 DEALLOCATE pgss_test;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
- calls | rows |                                    query                                     
--------+------+------------------------------------------------------------------------------
-     1 |    1 | PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3
-     4 |    4 | SELECT $1                                                                   +
-       |      |   -- but this one will appear                                               +
-       |      |   AS "text"
-     2 |    2 | SELECT $1 + $2
-     3 |    3 | SELECT $1 + $2 + $3 AS "add"
-     1 |    1 | SELECT $1 AS "float"
-     2 |    2 | SELECT $1 AS "int"
-     2 |    2 | SELECT $1 AS "int" LIMIT $2
-     2 |    0 | SELECT $1 AS "int" OFFSET $2
-     6 |    0 | SELECT $1 AS "int" OFFSET $2 LIMIT $3
...
59/4942 Avoid orphaned objects dependencies, take 3
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/strings.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/strings.out	2026-05-12 10:09:18.430383000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/strings.out	2026-05-12 10:11:23.104115000 ...
@@ -2227,1071 +2227,10 @@
 -- test strpos
 --
 SELECT strpos('abcdef', 'cd') AS "pos_3";
- pos_3 
--------
-     3
-(1 row)
-
-SELECT strpos('abcdef', 'xy') AS "pos_0";
- pos_0 
--------
-     0
-(1 row)
-
-SELECT strpos('abcdef', '') AS "pos_1";
- pos_1 
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:18.388613000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/multirangetypes.out	2026-05-12 10:12:16....
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:18.388613000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/multirangetypes.out	2026-05-12 10:11:24.285052000 +0000
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/build/testrun/test_plan...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:18.388613000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/multirangetypes.out	2026-05-12 1...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:21.912958677 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/multirangetypes.out	2026-05-12 10:14:53.518454429 +0000
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/src/test/modules/test_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:21.912958677 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/multirangetypes.out	2026-05-12 10:16:36.742...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/src/test/recovery/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:21.912958677 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/multirangetypes.out	2026-05-12 10:17:02.775042827 +0000
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/src/test/regress/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:21.912958677 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/multirangetypes.out	2026-05-12 10:14:01.798376081 +0000
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:14.692957815 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/multirangetypes.out	2026-05-12 10:13:25.25...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:14.692957815 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/multirangetypes.out	2026-05-12 10:14:29....
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:14.692957815 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/multirangetypes.out	2026-05-12 10:13:24.497002333 +0000
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out /tmp/cirrus-ci-build/build/testrun/test_plan...
--- /tmp/cirrus-ci-build/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:14.692957815 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/multirangetypes.out	2026-05-12 1...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/multirangetypes.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/multirangetypes.out	2026-05-12 10:08:04
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/multirangetypes.out	2026-05-12 10:11:36
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/multirangetypes.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/multirangetypes.out	2026-05-12 10:08:04
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/multirangetypes.out	2026-05-12 10:13:03
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/multirangetypes.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/multirangetypes.out	2026-05-12 10:08:04
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/multirangetypes.out	2026-05-12 10:11:37
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/multirangetypes.out /Users/admin/pgsql/build/testrun/test_plan_adv...
--- /Users/admin/pgsql/src/test/regress/expected/multirangetypes.out	2026-05-12 10:08:04
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/multirangetypes.out	2026-05-12 10:...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/strings.out /home/postgres/postgres/build/testrun/pg_upgrade/...
--- /home/postgres/postgres/src/test/regress/expected/strings.out	2026-05-12 10:09:45.512869556 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/strings.out	2026-05-12 10:12:04.2443188...
@@ -2272,1026 +2272,10 @@
 (1 row)
 
 SELECT replace('yabadoo', 'bad', '') AS "yaoo";
- yaoo 
-------
- yaoo
-(1 row)
-
---
--- test split_part
---
-select split_part('','@',1) AS "empty string";
- empty string 
---------------
- 
-(1 row)
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/box.out /home/postgres/postgres/build/testrun/recovery/027_st...
--- /home/postgres/postgres/src/test/regress/expected/box.out	2026-05-12 10:09:45.217535595 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/box.out	2026-05-12 10:12:36.323522127...
@@ -509,160 +509,10 @@
 FROM quad_box_tbl WHERE b <@ box '((200,300),(500,600))';
 SET enable_seqscan = OFF;
 SET enable_indexscan = ON;
-SET enable_bitmapscan = ON;
-SELECT count(*) FROM quad_box_tbl WHERE b <<  box '((100,200),(300,500))';
- count 
--------
-   901
-(1 row)
-
-SELECT count(*) FROM quad_box_tbl WHERE b &<  box '((100,200),(300,500))';
- count 
--------
-  3901
-(1 row)
-
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/multirangetypes.out /home/postgres/postgres/build/testrun/reg...
--- /home/postgres/postgres/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:45.386808840 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/multirangetypes.out	2026-05-12 10:12:01.210722067 +000...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/multirangetypes.out /home/postgres/postgres/build/testrun/tes...
--- /home/postgres/postgres/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:45.386808840 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/multirangetypes.out	2026-05-1...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/multirangetypes.out C:/cirrus/build/testrun/pg_upgrade/...
--- C:/cirrus/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:15.889525300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/multirangetypes.out	2026-05-12 10:12:03.743613000 +00...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/multirangetypes.out C:/cirrus/build/testrun/recovery/02...
--- C:/cirrus/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:15.889525300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/multirangetypes.out	2026-05-12 10:15:07.287963300 +...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/multirangetypes.out C:/cirrus/build/testrun/regress/reg...
--- C:/cirrus/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:15.889525300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/multirangetypes.out	2026-05-12 10:12:02.524882700 +0000
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/multirangetypes.out C:/cirrus/build/testrun/test_plan_a...
--- C:/cirrus/src/test/regress/expected/multirangetypes.out	2026-05-12 10:09:15.889525300 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/multirangetypes.out	2026-05-12 10:12:02.634...
@@ -3273,261 +3273,7 @@
 grant create on schema mr_sch to regress_mr;
 set role regress_mr;
 create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
-reset role;
-drop type mytype;
-drop schema mr_sch;
-drop role regress_mr;
---
--- Test polymorphic type system
---
-create function anyarray_anymultirange_func(a anyarray, r anymultirange)
-  returns anyelement as 'select $1[1] + lower($2);' language sql;
-select anyarray_anymultirange_func(ARRAY[1,2], int4multirange(int4range(10,20)));
- anyarray_anymultirange_func 
------------------------------
-                          11
...
59/6736 COPY ON_CONFLICT TABLE; save duplicated record to another table.
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy.out	2026-05-12 08:42:06.591659000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy.out	2026-05-12 08:44:42.510734000 +00...
@@ -433,178 +433,7 @@
 create unique index tab_progress_reporting_idx1 on tab_progress_reporting(name);
 create temp table conflict_tbl(copy_tbl oid, filename text, lineno bigint, line text);
 copy tab_progress_reporting from stdin(on_conflict table, conflict_table 'conflict_tbl');
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 3, "ha...
-NOTICE:  3 rows were saved to conflict table "conflict_tbl" due to unique constraint violation
-drop index tab_progress_reporting_idx1;
-drop table conflict_tbl;
--- Generate COPY FROM report with PIPE, with some skipped tuples.
-copy tab_progress_reporting from stdin(on_error ignore);
-NOTICE:  2 rows were skipped due to data type incompatibility
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 2, "ha...
-drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
-drop function notice_after_tab_progress_reporting();
-drop table tab_progress_reporting;
--- Test header matching feature
-create table header_copytest (
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy.out	2026-05-12 08:42:06.591659000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy.out	2026-05-12 08:45:45.500780000 +...
@@ -433,178 +433,7 @@
 create unique index tab_progress_reporting_idx1 on tab_progress_reporting(name);
 create temp table conflict_tbl(copy_tbl oid, filename text, lineno bigint, line text);
 copy tab_progress_reporting from stdin(on_conflict table, conflict_table 'conflict_tbl');
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 3, "ha...
-NOTICE:  3 rows were saved to conflict table "conflict_tbl" due to unique constraint violation
-drop index tab_progress_reporting_idx1;
-drop table conflict_tbl;
--- Generate COPY FROM report with PIPE, with some skipped tuples.
-copy tab_progress_reporting from stdin(on_error ignore);
-NOTICE:  2 rows were skipped due to data type incompatibility
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 2, "ha...
-drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
-drop function notice_after_tab_progress_reporting();
-drop table tab_progress_reporting;
--- Test header matching feature
-create table header_copytest (
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy.out /tmp/cirrus-ci-build/build/testrun/regress/regress/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy.out	2026-05-12 08:42:06.591659000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy.out	2026-05-12 08:44:40.352177000 +0000
@@ -433,178 +433,7 @@
 create unique index tab_progress_reporting_idx1 on tab_progress_reporting(name);
 create temp table conflict_tbl(copy_tbl oid, filename text, lineno bigint, line text);
 copy tab_progress_reporting from stdin(on_conflict table, conflict_table 'conflict_tbl');
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 3, "ha...
-NOTICE:  3 rows were saved to conflict table "conflict_tbl" due to unique constraint violation
-drop index tab_progress_reporting_idx1;
-drop table conflict_tbl;
--- Generate COPY FROM report with PIPE, with some skipped tuples.
-copy tab_progress_reporting from stdin(on_error ignore);
-NOTICE:  2 rows were skipped due to data type incompatibility
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 2, "ha...
-drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
-drop function notice_after_tab_progress_reporting();
-drop table tab_progress_reporting;
--- Test header matching feature
-create table header_copytest (
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy.out	2026-05-12 08:42:06.591659000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/copy.out	2026-05-12 08:44:43.095...
@@ -433,178 +433,7 @@
 create unique index tab_progress_reporting_idx1 on tab_progress_reporting(name);
 create temp table conflict_tbl(copy_tbl oid, filename text, lineno bigint, line text);
 copy tab_progress_reporting from stdin(on_conflict table, conflict_table 'conflict_tbl');
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 3, "ha...
-NOTICE:  3 rows were saved to conflict table "conflict_tbl" due to unique constraint violation
-drop index tab_progress_reporting_idx1;
-drop table conflict_tbl;
--- Generate COPY FROM report with PIPE, with some skipped tuples.
-copy tab_progress_reporting from stdin(on_error ignore);
-NOTICE:  2 rows were skipped due to data type incompatibility
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 2, "ha...
-drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
-drop function notice_after_tab_progress_reporting();
-drop table tab_progress_reporting;
--- Test header matching feature
-create table header_copytest (
...
59/4817 COPY (on_error table) saving error info to a table
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2026-05-12 07:48:56.120129000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2026-05-12 07:54:07.267107000 +0...
@@ -952,18 +952,16 @@
 ALTER TABLE err_tbl ADD CONSTRAINT cc3 NOT NULL userid;
 -- ok, constraints on table err_tbl1 will be vertified
 COPY t_on_error_table(b, a) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl1);
-NOTICE:  1 row was saved to table "err_tbl1" due to data type incompatibility
+ERROR:  relation with OID 2139062143 does not exist
 ALTER TABLE err_tbl DROP CONSTRAINT cc2;
 ALTER TABLE err_tbl DROP CONSTRAINT cc3;
 TRUNCATE err_tbl;
 -- fail, copied data have extra columns
 COPY t_on_error_table(a,b) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl);
-ERROR:  extra data after last expected column
-CONTEXT:  COPY t_on_error_table, line 1: "1,2,3,4,5"
+ERROR:  relation with OID 2139062143 does not exist
 -- fail, copied data have less columns
 COPY t_on_error_table(a,b) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl);
-ERROR:  extra data after last expected column
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2026-05-12 07:48:56.120129000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2026-05-12 07:55:47.671908000 ...
@@ -952,18 +952,16 @@
 ALTER TABLE err_tbl ADD CONSTRAINT cc3 NOT NULL userid;
 -- ok, constraints on table err_tbl1 will be vertified
 COPY t_on_error_table(b, a) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl1);
-NOTICE:  1 row was saved to table "err_tbl1" due to data type incompatibility
+ERROR:  relation with OID 2139062143 does not exist
 ALTER TABLE err_tbl DROP CONSTRAINT cc2;
 ALTER TABLE err_tbl DROP CONSTRAINT cc3;
 TRUNCATE err_tbl;
 -- fail, copied data have extra columns
 COPY t_on_error_table(a,b) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl);
-ERROR:  extra data after last expected column
-CONTEXT:  COPY t_on_error_table, line 1: "1,2,3,4,5"
+ERROR:  relation with OID 2139062143 does not exist
 -- fail, copied data have less columns
 COPY t_on_error_table(a,b) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl);
-ERROR:  extra data after last expected column
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2026-05-12 07:48:56.120129000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2026-05-12 07:54:10.270196000 +0000
@@ -952,18 +952,16 @@
 ALTER TABLE err_tbl ADD CONSTRAINT cc3 NOT NULL userid;
 -- ok, constraints on table err_tbl1 will be vertified
 COPY t_on_error_table(b, a) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl1);
-NOTICE:  1 row was saved to table "err_tbl1" due to data type incompatibility
+ERROR:  relation with OID 2139062143 does not exist
 ALTER TABLE err_tbl DROP CONSTRAINT cc2;
 ALTER TABLE err_tbl DROP CONSTRAINT cc3;
 TRUNCATE err_tbl;
 -- fail, copied data have extra columns
 COPY t_on_error_table(a,b) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl);
-ERROR:  extra data after last expected column
-CONTEXT:  COPY t_on_error_table, line 1: "1,2,3,4,5"
+ERROR:  relation with OID 2139062143 does not exist
 -- fail, copied data have less columns
 COPY t_on_error_table(a,b) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl);
-ERROR:  extra data after last expected column
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2026-05-12 07:48:56.120129000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/copy2.out	2026-05-12 07:54:11.95...
@@ -952,18 +952,16 @@
 ALTER TABLE err_tbl ADD CONSTRAINT cc3 NOT NULL userid;
 -- ok, constraints on table err_tbl1 will be vertified
 COPY t_on_error_table(b, a) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl1);
-NOTICE:  1 row was saved to table "err_tbl1" due to data type incompatibility
+ERROR:  relation with OID 2139062143 does not exist
 ALTER TABLE err_tbl DROP CONSTRAINT cc2;
 ALTER TABLE err_tbl DROP CONSTRAINT cc3;
 TRUNCATE err_tbl;
 -- fail, copied data have extra columns
 COPY t_on_error_table(a,b) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl);
-ERROR:  extra data after last expected column
-CONTEXT:  COPY t_on_error_table, line 1: "1,2,3,4,5"
+ERROR:  relation with OID 2139062143 does not exist
 -- fail, copied data have less columns
 COPY t_on_error_table(a,b) FROM STDIN WITH (DELIMITER ',', on_error table, error_table err_tbl);
-ERROR:  extra data after last expected column
...
59/4971 [CREATE|RE] INDEX CONCURRENTLY with single heap scan
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:27.010219000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:51:36.736611000...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:27.010219000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:53:35.8580150...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:27.010219000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:51:36.833308000 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:27.010219000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:51:45...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/pg_upgrade...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-08 10:45:50.708769479 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:50:09.093980...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/recovery/0...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-08 10:45:50.708769479 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:51:05.0667...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/regress/re...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-08 10:45:50.708769479 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:50:12.722643850 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/test_plan_...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-08 10:45:50.708769479 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:50...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:24.043242932 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2026-05-08 10:55:41.982326100 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/modules/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:24.043242932 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/indexing.out	2026-05-08 10:57:19.550357003 ...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:24.043242932 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2026-05-08 10:57:00.546350923 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/regress/results/index...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:24.043242932 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2026-05-08 10:52:50.690274959 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:18.784896005 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:51:03.222614282...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:18.784896005 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:52:44.5936474...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:18.784896005 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:51:05.822581874 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:18.784896005 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:51:11...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-08 10:45:29
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:50:28
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-08 10:45:29
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:51:47
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-08 10:45:29
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:50:28
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/test_plan_advice/001...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-08 10:45:29
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:50:30
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/pg_upgrade...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	Fri May  8 10:45:46 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	Fri May  8 10:51:54 2026
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/recovery/0...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	Fri May  8 10:45:46 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	Fri May  8 10:54:50 2026
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/regress/re...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	Fri May  8 10:45:46 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	Fri May  8 10:51:45 2026
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/test_plan_...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	Fri May  8 10:45:46 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	Fri May  8 10:51...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-08 10:45:20.166046100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:50:32.728275900 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/recovery/027_strea...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-08 10:45:20.166046100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:54:05.599280200 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/regress/regress/re...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-08 10:45:20.166046100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:50:19.481693800 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/test_plan_advice/0...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-08 10:45:20.166046100 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:50:28.044678000 ...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...
59/6059 Improving the names generated for indexes on expressions
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:50:57.426591430 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2026-05-08 09:00:13.449984965 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/modules/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:50:57.426591430 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/indexing.out	2026-05-08 09:01:15.725940310 ...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:50:57.426591430 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2026-05-08 09:00:55.297954710 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/regress/results/index...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:50:57.426591430 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2026-05-08 08:56:42.590172057 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:35:09.996958000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:40:59.785852000...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:35:09.996958000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:42:18.9887700...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:35:09.996958000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:41:08.385870000 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:35:09.996958000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:41:19...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:35:11.974003127 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:40:34.370521416...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:35:11.974003127 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:42:14.3271990...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:35:11.974003127 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:40:34.106520147 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:35:11.974003127 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:40:41...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-08 08:35:23
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:41:37
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-08 08:35:23
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:43:35
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-08 08:35:23
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:41:37
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/test_plan_advice/001...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-08 08:35:23
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:41:39
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/pg_upgrade...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-08 08:35:41.331384988 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:39:42.049150...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/recovery/0...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-08 08:35:41.331384988 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:40:38.6482...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/regress/re...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-08 08:35:41.331384988 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:39:33.941976804 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/test_plan_...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-08 08:35:41.331384988 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:39...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-08 08:35:15.389437100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:40:39.247133800 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/recovery/027_strea...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-08 08:35:15.389437100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:44:14.835873800 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/regress/regress/re...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-08 08:35:15.389437100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:40:18.691939800 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/test_plan_advice/0...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-08 08:35:15.389437100 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:40:32.418031100 ...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...
59/6270 skip check constraints verification for unaffected columns during UPDATE
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out	2026-05-05 07:10:48
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:13:30
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out	2026-05-05 07:10:48
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:14:55
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out	2026-05-05 07:10:48
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:13:25
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out /Users/admin/pgsql/build/testrun/test_plan_advi...
--- /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out	2026-05-05 07:10:48
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05 07:1...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/for_portion_of.out C:/cirrus/build/testrun/pg_upgrade/0...
--- C:/cirrus/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:28.222315600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:15:51.836766400 +000...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/for_portion_of.out C:/cirrus/build/testrun/recovery/027...
--- C:/cirrus/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:28.222315600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:19:49.775743200 +0...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/for_portion_of.out C:/cirrus/build/testrun/regress/regr...
--- C:/cirrus/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:28.222315600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:15:37.093581800 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/for_portion_of.out C:/cirrus/build/testrun/test_plan_ad...
--- C:/cirrus/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:28.222315600 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05 07:15:42.1458...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:09.594871958 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:14:54.484...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:09.594871958 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:16:41.8...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:09.594871958 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:14:54.676257881 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/test_plan_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:09.594871958 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05 07...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/pg_u...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	Tue May  5 07:11:28 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	Tue May  5 07:14:54 ...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/reco...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	Tue May  5 07:11:28 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	Tue May  5 07:17:1...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/regr...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	Tue May  5 07:11:28 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/for_portion_of.out	Tue May  5 07:14:47 2026
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/test...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	Tue May  5 07:11:28 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	Tue May  5...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:03.251281978 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/for_portion_of.out	2026-05-05 07:19:09.003976079 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/src/test/modules/test_pl...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:03.251281978 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/for_portion_of.out	2026-05-05 07:20:58.2588...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/src/test/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:03.251281978 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/for_portion_of.out	2026-05-05 07:20:40.450907440 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/src/test/regress/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:03.251281978 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/for_portion_of.out	2026-05-05 07:16:50.062217867 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:03.195678000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:13:14.356...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:03.195678000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:14:37.3...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:03.195678000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:13:15.914564000 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/test_plan_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:03.195678000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05 07...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/pg_u...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:29.328544742 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:14:56....
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/reco...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:29.328544742 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:15:4...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/regr...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:29.328544742 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:14:56.619044013 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/test...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:29.328544742 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...
59/6553 Decorrelate nested tuple hash tables
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/union.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/union.out	2026-05-04 11:33:35.379872000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/union.out	2026-05-04 11:37:15.586826000 ...
@@ -550,9 +550,9 @@
 select x from (values (array[1, 2]), (array[1, 3])) _(x) union select x from (values (array[1, 2]), (array[1, 4])) _(x)...
    x   
 -------
+ {1,2}
  {1,4}
  {1,3}
- {1,2}
 (3 rows)
 
 explain (costs off)
59/5720 virtual generated column as partition key
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/pg_upgrad...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:03.831515400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:45:12.669426200 +...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/recovery/...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:03.831515400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:49:15.916023400...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/regress/r...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:03.831515400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:45:05.280775600 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/test_plan...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:03.831515400 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05-03 07:45:08.1...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.065096072 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:45:38....
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.065096072 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:47:1...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.065096072 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:45:36.936387384 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/test_pl...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.065096072 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05-03...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/pg_upgrade/...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:02
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:45:57
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/recovery/02...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:02
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:48:49
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/regress/reg...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:02
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:45:46
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/test_plan_a...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:02
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05-03 0...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tm...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.063863157 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/generated_virtual.out	2026-05-03 07:49:48.390548551 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/modules/test...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.063863157 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/generated_virtual.out	2026-05-03 07:52:13.1...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/recovery/tmp...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.063863157 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/generated_virtual.out	2026-05-03 07:51:54.406346782 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/regress/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.063863157 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/generated_virtual.out	2026-05-03 07:46:59.157855013 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/p...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Sun May  3 07:41:12 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	Sun May  3 07:45:...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Sun May  3 07:41:12 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	Sun May  3 07:4...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Sun May  3 07:41:12 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_virtual.out	Sun May  3 07:45:19 2026
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/t...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Sun May  3 07:41:12 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	Sun May...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/p...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:21.058498400 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:44:...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:21.058498400 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:4...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:21.058498400 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:44:23.666184256 +0...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/t...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:21.058498400 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:52.548813000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:44:20....
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:52.548813000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:45:5...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:52.548813000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:44:31.513586000 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/test_pl...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:52.548813000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05-03...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row
59/6422 ANALYZE: hash-accelerate MCV tracking for equality-only types
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/isolation/expected/timeouts.out /home/postgres/postgres/build/testrun/isolatio...
--- /home/postgres/postgres/src/test/isolation/expected/timeouts.out	2026-05-03 07:09:13.281029504 +0000
+++ /home/postgres/postgres/build/testrun/isolation/isolation/results/timeouts.out	2026-05-03 07:11:49.174492534 +0000
@@ -11,7 +11,7 @@
 step sto: SET statement_timeout = '10ms';
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
-ERROR:  canceling statement due to statement timeout
+ERROR:  canceling statement due to user request
 
 starting permutation: rdtbl lto locktbl
 step rdtbl: SELECT * FROM accounts;
59/6397 extended statistic (examine_variable) ignored CollateExpr
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out /home/postgres/postgres/build/testrun/pg...
--- /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out	Wed Apr 29 21:57:38 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	Wed Apr 29 22:00:0...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out /home/postgres/postgres/build/testrun/re...
--- /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out	Wed Apr 29 21:57:38 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	Wed Apr 29 22:02...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out /home/postgres/postgres/build/testrun/re...
--- /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out	Wed Apr 29 21:57:38 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/collate.icu.utf8.out	Wed Apr 29 22:00:00 2026
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out /home/postgres/postgres/build/testrun/te...
--- /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out	Wed Apr 29 21:57:38 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	Wed Apr ...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:33.224402716 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/collate.icu.utf8.out	2026-04-29 22:03:55.716330830 +0000
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/src/test/modules/test_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:33.224402716 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/collate.icu.utf8.out	2026-04-29 22:05:56.52...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/src/test/recovery/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:33.224402716 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/collate.icu.utf8.out	2026-04-29 22:06:03.836311970 +0000
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/src/test/regress/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:33.224402716 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/collate.icu.utf8.out	2026-04-29 22:02:01.080346134 +0000
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/pg_upgra...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:27.784355423 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-04-29 21:59:41.7...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/recovery...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:27.784355423 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	2026-04-29 22:01:18...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:27.784355423 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/collate.icu.utf8.out	2026-04-29 21:59:38.547340341 +0000
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/test_pla...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:27.784355423 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	2026-04-29 ...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out /home/postgres/postgres/build/testrun/pg...
--- /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:57.238890473 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-04-29 21:59:4...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/pg_upgra...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:27.840069000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-04-29 21:59:59.6...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/recovery...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:27.840069000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	2026-04-29 22:01:39...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:27.840069000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/collate.icu.utf8.out	2026-04-29 22:00:00.491659000 +0000
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/test_pla...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:27.840069000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	2026-04-29 ...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out /Users/admin/pgsql/build/testrun/pg_upgrade/0...
--- /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:35
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-04-29 22:00:31
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out /Users/admin/pgsql/build/testrun/recovery/027...
--- /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:35
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	2026-04-29 22:02:02
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out /Users/admin/pgsql/build/testrun/regress/regr...
--- /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:35
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/collate.icu.utf8.out	2026-04-29 22:00:24
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out /Users/admin/pgsql/build/testrun/test_plan_ad...
--- /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out	2026-04-29 21:57:35
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	2026-04-29 22...
@@ -2753,15 +2753,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...
59/6643 New Table Access Methods for Multi and Single Inserts
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/contrib/pg_stat_statements/expected/wal.out /Users/admin/pgsql/build/testrun/pg_stat_stateme...
--- /Users/admin/pgsql/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:14
+++ /Users/admin/pgsql/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:26:55
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgr...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum.out	2026-04-28 17:20:17
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	2026-04-28 17:24:42
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /Users/admin/pgsql/contrib/pg_walinspect/expected/pg_walinspect.out /Users/admin/pgsql/build/testrun/pg_walinsp...
--- /Users/admin/pgsql/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:20:14
+++ /Users/admin/pgsql/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:26:56
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...
regress
diff -U3 /Users/admin/pgsql/contrib/postgres_fdw/expected/postgres_fdw.out /Users/admin/pgsql/build/testrun/postgres_fdw...
--- /Users/admin/pgsql/contrib/postgres_fdw/expected/postgres_fdw.out	2026-04-28 17:20:14
+++ /Users/admin/pgsql/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:27:01
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum.out /Users/admin/pgsql/build/testrun/recovery/027_stream_re...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum.out	2026-04-28 17:20:17
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	2026-04-28 17:26:03
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum.out /Users/admin/pgsql/build/testrun/regress/regress/result...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum.out	2026-04-28 17:20:17
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/vacuum.out	2026-04-28 17:24:39
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum.out /Users/admin/pgsql/build/testrun/test_plan_advice/001_r...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum.out	2026-04-28 17:20:17
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	2026-04-28 17:24:41
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/contrib/pg_stat_statements/expected/wal.out C:/cirrus/build/testrun/pg_stat_state...
--- C:/cirrus/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:15.442740200 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:29:56.133181200 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/copy.out	2026-04-28 17:20:20.144378900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy.out	2026-04-28 17:23:11.635005800 +0000
@@ -624,24 +624,28 @@
 INSERT INTO copy_bulk_src SELECT g, 'row-' || g FROM generate_series(1, 2500) g;
 CREATE TABLE copy_bulk_dst (a int, b text);
 COPY copy_bulk_src TO '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for writing: No such file or directory
+HINT:  COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psq...
 COPY copy_bulk_dst FROM '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for reading: No such file or directory
+HINT:  COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as ps...
 SELECT count(*) FROM copy_bulk_dst;
  count 
 -------
-  2500
+     0
 (1 row)
 
 SELECT min(a), max(a) FROM copy_bulk_dst;
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/contrib/pg_walinspect/expected/pg_walinspect.out C:/cirrus/build/testrun/pg_walin...
--- C:/cirrus/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:20:15.520080600 +0000
+++ C:/cirrus/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:29:57.337775400 +0000
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/contrib/postgres_fdw/expected/postgres_fdw.out C:/cirrus/build/testrun/postgres_f...
--- C:/cirrus/contrib/postgres_fdw/expected/postgres_fdw.out	2026-04-28 17:20:15.630553400 +0000
+++ C:/cirrus/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:30:10.046740500 +0000
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy.out C:/cirrus/build/testrun/recovery/027_stream_re...
--- C:/cirrus/src/test/regress/expected/copy.out	2026-04-28 17:20:20.144378900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/copy.out	2026-04-28 17:27:09.560575000 +0000
@@ -624,24 +624,28 @@
 INSERT INTO copy_bulk_src SELECT g, 'row-' || g FROM generate_series(1, 2500) g;
 CREATE TABLE copy_bulk_dst (a int, b text);
 COPY copy_bulk_src TO '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for writing: No such file or directory
+HINT:  COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psq...
 COPY copy_bulk_dst FROM '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for reading: No such file or directory
+HINT:  COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as ps...
 SELECT count(*) FROM copy_bulk_dst;
  count 
 -------
-  2500
+     0
 (1 row)
 
 SELECT min(a), max(a) FROM copy_bulk_dst;
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy.out C:/cirrus/build/testrun/regress/regress/result...
--- C:/cirrus/src/test/regress/expected/copy.out	2026-04-28 17:20:20.144378900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/copy.out	2026-04-28 17:23:07.538810800 +0000
@@ -624,24 +624,28 @@
 INSERT INTO copy_bulk_src SELECT g, 'row-' || g FROM generate_series(1, 2500) g;
 CREATE TABLE copy_bulk_dst (a int, b text);
 COPY copy_bulk_src TO '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for writing: No such file or directory
+HINT:  COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psq...
 COPY copy_bulk_dst FROM '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for reading: No such file or directory
+HINT:  COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as ps...
 SELECT count(*) FROM copy_bulk_dst;
  count 
 -------
-  2500
+     0
 (1 row)
 
 SELECT min(a), max(a) FROM copy_bulk_dst;
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy.out C:/cirrus/build/testrun/test_plan_advice/001_r...
--- C:/cirrus/src/test/regress/expected/copy.out	2026-04-28 17:20:20.144378900 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/copy.out	2026-04-28 17:23:10.525629600 +000...
@@ -624,24 +624,28 @@
 INSERT INTO copy_bulk_src SELECT g, 'row-' || g FROM generate_series(1, 2500) g;
 CREATE TABLE copy_bulk_dst (a int, b text);
 COPY copy_bulk_src TO '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for writing: No such file or directory
+HINT:  COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psq...
 COPY copy_bulk_dst FROM '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for reading: No such file or directory
+HINT:  COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as ps...
 SELECT count(*) FROM copy_bulk_dst;
  count 
 -------
-  2500
+     0
 (1 row)
 
 SELECT min(a), max(a) FROM copy_bulk_dst;
...
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out /tmp/cirrus-ci-build/build/testrun/pg_stat_sta...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:08.558306780 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:28:14.005169841 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:10.562306822 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	2026-04-28 17:24:39.557324834 +...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pg_walinspect/expected/pg_walinspect.out /tmp/cirrus-ci-build/build/testrun/pg_wal...
--- /tmp/cirrus-ci-build/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:20:08.570306780 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:28:17.589165242 +00...
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/build/testrun/postgres...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2026-04-28 17:20:08.598306780 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:28:38.373140297 +0000
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/recovery/027_strea...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:10.562306822 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	2026-04-28 17:26:59.645216146...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/regress/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:10.562306822 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum.out	2026-04-28 17:24:41.253322163 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:10.562306822 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	2026-04-28 17:24:43.4...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out /tmp/cirrus-ci-build/contrib/pg_stat_statement...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:36.687516834 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/wal.out	2026-04-28 17:27:07.747114783 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:38.527514763 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/vacuum.out	2026-04-28 17:27:30.907096792 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/src/test/modules/test_plan_advic...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:38.527514763 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/vacuum.out	2026-04-28 17:29:34.459015702 +0...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:38.527514763 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/vacuum.out	2026-04-28 17:29:37.199014095 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/src/test/regress/results/vacuum....
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:38.527514763 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/vacuum.out	2026-04-28 17:25:23.835216253 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/contrib/pg_stat_statements/expected/wal.out /home/postgres/postgres/build/testrun/pg_st...
--- /home/postgres/postgres/contrib/pg_stat_statements/expected/wal.out	Tue Apr 28 17:21:01 2026
+++ /home/postgres/postgres/build/testrun/pg_stat_statements/regress/results/wal.out	Tue Apr 28 17:27:05 2026
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/pg_upgrade/0...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	Tue Apr 28 17:21:11 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	Tue Apr 28 17:24:10 2026
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /home/postgres/postgres/contrib/pg_walinspect/expected/pg_walinspect.out /home/postgres/postgres/build/testrun/...
--- /home/postgres/postgres/contrib/pg_walinspect/expected/pg_walinspect.out	Tue Apr 28 17:21:02 2026
+++ /home/postgres/postgres/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	Tue Apr 28 17:27:06 2026
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...
regress
diff -U3 /home/postgres/postgres/contrib/postgres_fdw/expected/postgres_fdw.out /home/postgres/postgres/build/testrun/po...
--- /home/postgres/postgres/contrib/postgres_fdw/expected/postgres_fdw.out	Tue Apr 28 17:21:02 2026
+++ /home/postgres/postgres/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	Tue Apr 28 17:27:25 2026
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/recovery/027...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	Tue Apr 28 17:21:11 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	Tue Apr 28 17:26:09 2026
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/regress/regr...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	Tue Apr 28 17:21:11 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/vacuum.out	Tue Apr 28 17:24:05 2026
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/test_plan_ad...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	Tue Apr 28 17:21:11 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	Tue Apr 28 17:24:1...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/contrib/pg_stat_statements/expected/wal.out /home/postgres/postgres/build/testrun/pg_st...
--- /home/postgres/postgres/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:57.785658987 +0000
+++ /home/postgres/postgres/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:24:46.940200163 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/pg_upgrade/0...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	2026-04-28 17:21:06.892003247 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	2026-04-28 17:23:24.14153601...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /home/postgres/postgres/contrib/pg_walinspect/expected/pg_walinspect.out /home/postgres/postgres/build/testrun/...
--- /home/postgres/postgres/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:20:57.912968021 +0000
+++ /home/postgres/postgres/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:24:47.874833874 ...
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...
regress
diff -U3 /home/postgres/postgres/contrib/postgres_fdw/expected/postgres_fdw.out /home/postgres/postgres/build/testrun/po...
--- /home/postgres/postgres/contrib/postgres_fdw/expected/postgres_fdw.out	2026-04-28 17:20:58.107453422 +0000
+++ /home/postgres/postgres/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:24:55.037253251 +0...
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/recovery/027...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	2026-04-28 17:21:06.892003247 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	2026-04-28 17:24:01.489371...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/regress/regr...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	2026-04-28 17:21:06.892003247 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/vacuum.out	2026-04-28 17:23:20.053496839 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/test_plan_ad...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	2026-04-28 17:21:06.892003247 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	2026-04-28 17:23:2...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out /tmp/cirrus-ci-build/build/testrun/pg_stat_sta...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:21:09.856737000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:25:44.618194000 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:21:11.534108000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	2026-04-28 17:23:26.099721000 +...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pg_walinspect/expected/pg_walinspect.out /tmp/cirrus-ci-build/build/testrun/pg_wal...
--- /tmp/cirrus-ci-build/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:21:09.868222000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:25:44.524403000 +00...
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/build/testrun/postgres...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2026-04-28 17:21:09.892402000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:26:35.261726000 +0000
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/recovery/027_strea...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:21:11.534108000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	2026-04-28 17:24:52.663917000...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/regress/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:21:11.534108000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum.out	2026-04-28 17:23:21.767095000 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:21:11.534108000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	2026-04-28 17:23:29.2...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...
59/6610 ORDER BY ALL
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out /tmp/cirrus-ci-build/build/testrun/plpgsql/re...
--- /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-04-27 04:01:04.108080988 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:07:40.918240415 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/pl/plpgsql/src/expected/plpgsql_misc.out /Users/admin/pgsql/build/testrun/plpgsql/regres...
--- /Users/admin/pgsql/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-04-27 04:01:13
+++ /Users/admin/pgsql/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:08:18
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plpgsql/src/expected/plpgsql_misc.out C:/cirrus/build/testrun/plpgsql/regr...
--- C:/cirrus/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-04-27 04:01:06.564122100 +0000
+++ C:/cirrus/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:10:14.938484200 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/pl/plpgsql/src/expected/plpgsql_misc.out /home/postgres/postgres/build/testrun/plpg...
--- /home/postgres/postgres/src/pl/plpgsql/src/expected/plpgsql_misc.out	Mon Apr 27 04:01:14 2026
+++ /home/postgres/postgres/build/testrun/plpgsql/regress/results/plpgsql_misc.out	Mon Apr 27 04:07:42 2026
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out /tmp/cirrus-ci-build/src/pl/plpgsql/src/resul...
--- /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-04-27 04:01:08.242381028 +0000
+++ /tmp/cirrus-ci-build/src/pl/plpgsql/src/results/plpgsql_misc.out	2026-04-27 04:05:19.481299977 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/pl/plpgsql/src/expected/plpgsql_misc.out /home/postgres/postgres/build/testrun/plpg...
--- /home/postgres/postgres/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-04-27 04:01:31.357454487 +0000
+++ /home/postgres/postgres/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:05:37.655346565 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out /tmp/cirrus-ci-build/build/testrun/plpgsql/re...
--- /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-04-27 04:01:03.765882000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:04:58.431789000 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...
58/6029 NOT NULL NOT ENFORCED
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:32:19.043040162 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2026-04-04 10:34:54.452511...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:32:19.075050615 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/inherit.out	2026-04-04 10:34:56.180634995 ...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:32:19.043040162 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2026-04-04 10:36:40.6430...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:32:19.075050615 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/inherit.out	2026-04-04 10:36:42.38312698...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:32:19.043040162 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/constraints.out	2026-04-04 10:34:53.848468355 +0000
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/build/testrun/regress/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:32:19.075050615 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/inherit.out	2026-04-04 10:34:55.892614350 +0000
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:32:19.043040162 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/constraints.out	2026-04-04 10:34...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:32:19.075050615 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/inherit.out	2026-04-04 10:34:59....
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/constraints.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/constraints.out	2026-04-04 10:31:22
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2026-04-04 10:33:40
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /Users/admin/pgsql/src/test/regress/expected/inherit.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upg...
--- /Users/admin/pgsql/src/test/regress/expected/inherit.out	2026-04-04 10:31:22
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/inherit.out	2026-04-04 10:33:42
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/constraints.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/constraints.out	2026-04-04 10:31:22
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2026-04-04 10:35:09
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /Users/admin/pgsql/src/test/regress/expected/inherit.out /Users/admin/pgsql/build/testrun/recovery/027_stream_r...
--- /Users/admin/pgsql/src/test/regress/expected/inherit.out	2026-04-04 10:31:22
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/inherit.out	2026-04-04 10:35:11
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/constraints.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/constraints.out	2026-04-04 10:31:22
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/constraints.out	2026-04-04 10:33:35
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /Users/admin/pgsql/src/test/regress/expected/inherit.out /Users/admin/pgsql/build/testrun/regress/regress/resul...
--- /Users/admin/pgsql/src/test/regress/expected/inherit.out	2026-04-04 10:31:22
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/inherit.out	2026-04-04 10:33:35
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/constraints.out /Users/admin/pgsql/build/testrun/test_plan_advice/...
--- /Users/admin/pgsql/src/test/regress/expected/constraints.out	2026-04-04 10:31:22
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/constraints.out	2026-04-04 10:33:3...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /Users/admin/pgsql/src/test/regress/expected/inherit.out /Users/admin/pgsql/build/testrun/test_plan_advice/001_...
--- /Users/admin/pgsql/src/test/regress/expected/inherit.out	2026-04-04 10:31:22
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/inherit.out	2026-04-04 10:33:39
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/constraints.out C:/cirrus/build/testrun/pg_upgrade/002_...
--- C:/cirrus/src/test/regress/expected/constraints.out	2026-04-04 10:32:35.795946200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2026-04-04 10:35:57.751106000 +0000
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/inherit.out C:/cirrus/build/testrun/pg_upgrade/002_pg_u...
--- C:/cirrus/src/test/regress/expected/inherit.out	2026-04-04 10:32:35.866668400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/inherit.out	2026-04-04 10:35:58.798953600 +0000
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/constraints.out C:/cirrus/build/testrun/recovery/027_st...
--- C:/cirrus/src/test/regress/expected/constraints.out	2026-04-04 10:32:35.795946200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2026-04-04 10:40:04.194041300 +0000
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/inherit.out C:/cirrus/build/testrun/recovery/027_stream...
--- C:/cirrus/src/test/regress/expected/inherit.out	2026-04-04 10:32:35.866668400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/inherit.out	2026-04-04 10:40:07.087116700 +0000
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/constraints.out C:/cirrus/build/testrun/regress/regress...
--- C:/cirrus/src/test/regress/expected/constraints.out	2026-04-04 10:32:35.795946200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/constraints.out	2026-04-04 10:35:46.231082100 +0000
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/inherit.out C:/cirrus/build/testrun/regress/regress/res...
--- C:/cirrus/src/test/regress/expected/inherit.out	2026-04-04 10:32:35.866668400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/inherit.out	2026-04-04 10:35:46.168579200 +0000
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/constraints.out C:/cirrus/build/testrun/test_plan_advic...
--- C:/cirrus/src/test/regress/expected/constraints.out	2026-04-04 10:32:35.795946200 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/constraints.out	2026-04-04 10:35:50.5640930...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/inherit.out C:/cirrus/build/testrun/test_plan_advice/00...
--- C:/cirrus/src/test/regress/expected/inherit.out	2026-04-04 10:32:35.866668400 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/inherit.out	2026-04-04 10:35:51.908326000 +...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:31:43.566652328 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/constraints.out	2026-04-04 10:37:53.040856969 +0000
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:31:43.598794520 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/inherit.out	2026-04-04 10:37:55.841005712 +0000
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/src/test/modules/test_plan_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:31:43.566652328 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/constraints.out	2026-04-04 10:39:59.6399183...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/src/test/modules/test_plan_advi...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:31:43.598794520 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/inherit.out	2026-04-04 10:40:03.675693533 +...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:31:43.566652328 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/constraints.out	2026-04-04 10:39:50.040508778 +0000
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:31:43.598794520 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/inherit.out	2026-04-04 10:39:54.812205290 +0000
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/src/test/regress/results/co...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:31:43.566652328 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/constraints.out	2026-04-04 10:35:33.046673942 +0000
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/src/test/regress/results/inheri...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:31:43.598794520 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/inherit.out	2026-04-04 10:35:35.950507724 +0000
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/constraints.out /home/postgres/postgres/build/testrun/pg_upgr...
--- /home/postgres/postgres/src/test/regress/expected/constraints.out	Sat Apr  4 10:32:45 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	Sat Apr  4 10:35:20 202...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /home/postgres/postgres/src/test/regress/expected/inherit.out /home/postgres/postgres/build/testrun/pg_upgrade/...
--- /home/postgres/postgres/src/test/regress/expected/inherit.out	Sat Apr  4 10:32:46 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/inherit.out	Sat Apr  4 10:35:23 2026
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/constraints.out /home/postgres/postgres/build/testrun/recover...
--- /home/postgres/postgres/src/test/regress/expected/constraints.out	Sat Apr  4 10:32:45 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/constraints.out	Sat Apr  4 10:37:38 2...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /home/postgres/postgres/src/test/regress/expected/inherit.out /home/postgres/postgres/build/testrun/recovery/02...
--- /home/postgres/postgres/src/test/regress/expected/inherit.out	Sat Apr  4 10:32:46 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/inherit.out	Sat Apr  4 10:37:42 2026
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/constraints.out /home/postgres/postgres/build/testrun/regress...
--- /home/postgres/postgres/src/test/regress/expected/constraints.out	Sat Apr  4 10:32:45 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/constraints.out	Sat Apr  4 10:35:14 2026
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /home/postgres/postgres/src/test/regress/expected/inherit.out /home/postgres/postgres/build/testrun/regress/reg...
--- /home/postgres/postgres/src/test/regress/expected/inherit.out	Sat Apr  4 10:32:46 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/inherit.out	Sat Apr  4 10:35:18 2026
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/constraints.out /home/postgres/postgres/build/testrun/test_pl...
--- /home/postgres/postgres/src/test/regress/expected/constraints.out	Sat Apr  4 10:32:45 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/constraints.out	Sat Apr  4 10...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /home/postgres/postgres/src/test/regress/expected/inherit.out /home/postgres/postgres/build/testrun/test_plan_a...
--- /home/postgres/postgres/src/test/regress/expected/inherit.out	Sat Apr  4 10:32:46 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/inherit.out	Sat Apr  4 10:35:...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/constraints.out /home/postgres/postgres/build/testrun/pg_upgr...
--- /home/postgres/postgres/src/test/regress/expected/constraints.out	2026-04-04 10:32:02.706310535 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2026-04-04 10:33:49.273...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /home/postgres/postgres/src/test/regress/expected/inherit.out /home/postgres/postgres/build/testrun/pg_upgrade/...
--- /home/postgres/postgres/src/test/regress/expected/inherit.out	2026-04-04 10:32:02.805192068 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/inherit.out	2026-04-04 10:33:47.1703629...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/constraints.out /home/postgres/postgres/build/testrun/recover...
--- /home/postgres/postgres/src/test/regress/expected/constraints.out	2026-04-04 10:32:02.706310535 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2026-04-04 10:34:25.1...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /home/postgres/postgres/src/test/regress/expected/inherit.out /home/postgres/postgres/build/testrun/recovery/02...
--- /home/postgres/postgres/src/test/regress/expected/inherit.out	2026-04-04 10:32:02.805192068 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/inherit.out	2026-04-04 10:34:27.09785...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/constraints.out /home/postgres/postgres/build/testrun/regress...
--- /home/postgres/postgres/src/test/regress/expected/constraints.out	2026-04-04 10:32:02.706310535 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/constraints.out	2026-04-04 10:33:42.051868747 +0000
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /home/postgres/postgres/src/test/regress/expected/inherit.out /home/postgres/postgres/build/testrun/regress/reg...
--- /home/postgres/postgres/src/test/regress/expected/inherit.out	2026-04-04 10:32:02.805192068 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/inherit.out	2026-04-04 10:33:43.033741968 +0000
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/constraints.out /home/postgres/postgres/build/testrun/test_pl...
--- /home/postgres/postgres/src/test/regress/expected/constraints.out	2026-04-04 10:32:02.706310535 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/constraints.out	2026-04-04 10...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /home/postgres/postgres/src/test/regress/expected/inherit.out /home/postgres/postgres/build/testrun/test_plan_a...
--- /home/postgres/postgres/src/test/regress/expected/inherit.out	2026-04-04 10:32:02.805192068 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/inherit.out	2026-04-04 10:33:...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:31:47.513072000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2026-04-04 10:33:47.413862...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:31:47.541845000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/inherit.out	2026-04-04 10:33:49.438596000 ...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:31:47.513072000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2026-04-04 10:35:12.2808...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:31:47.541845000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/inherit.out	2026-04-04 10:35:16.55937100...
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:31:47.513072000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/constraints.out	2026-04-04 10:33:47.521291000 +0000
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/build/testrun/regress/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:31:47.541845000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/inherit.out	2026-04-04 10:33:49.457523000 +0000
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2026-04-04 10:31:47.513072000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/constraints.out	2026-04-04 10:33...
@@ -1127,8 +1127,10 @@
 INSERT INTO ne_nn_tbl VALUES (NULL); -- ok
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl ALTER CONSTRAINT nn NOT ENFORCED; -- error
 ERROR:  cannot alter enforceability of constraint "nn" of relation "ne_nn_tbl"
+HINT:  Only foreign key and check constraints can change enforceability.
 ALTER TABLE ne_nn_tbl VALIDATE CONSTRAINT nn; -- error
 ERROR:  cannot validate NOT ENFORCED constraint
 ALTER TABLE ne_nn_tbl ADD CONSTRAINT nn_enforced1 NOT NULL x NOT ENFORCED;  -- error
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/inherit.out	2026-04-04 10:31:47.541845000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/inherit.out	2026-04-04 10:33:55....
@@ -1580,8 +1580,9 @@
  f1     | integer |           | not null |         | plain   |              | 
 Not-null constraints:
...
58/6410 Enhance btree's pageinspect
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/contrib/pageinspect/expected/btree.out C:/cirrus/build/testrun/pageinspect/regres...
--- C:/cirrus/contrib/pageinspect/expected/btree.out	2026-04-02 12:43:03.963735600 +0000
+++ C:/cirrus/build/testrun/pageinspect/regress/results/btree.out	2026-04-02 12:53:15.662560100 +0000
@@ -148,23 +148,25 @@
 ERROR:  block number 7 is out of range
 DROP TABLE test2;
 SELECT * FROM bt_page_items('test1_a_idx', -1);
-ERROR:  invalid block number -1
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', -1);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 0);
-ERROR:  block 0 is a meta page
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', 0);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 1);
--[ RECORD 1 ]-----------------------
...
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pageinspect/expected/btree.out /tmp/cirrus-ci-build/build/testrun/pageinspect/regr...
--- /tmp/cirrus-ci-build/contrib/pageinspect/expected/btree.out	2026-04-02 12:43:03.512409114 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pageinspect/regress/results/btree.out	2026-04-02 12:49:11.505895119 +0000
@@ -148,23 +148,25 @@
 ERROR:  block number 7 is out of range
 DROP TABLE test2;
 SELECT * FROM bt_page_items('test1_a_idx', -1);
-ERROR:  invalid block number -1
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', -1);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 0);
-ERROR:  block 0 is a meta page
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', 0);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 1);
--[ RECORD 1 ]-----------------------
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/contrib/pageinspect/expected/btree.out /Users/admin/pgsql/build/testrun/pageinspect/regress/...
--- /Users/admin/pgsql/contrib/pageinspect/expected/btree.out	2026-04-02 12:42:59
+++ /Users/admin/pgsql/build/testrun/pageinspect/regress/results/btree.out	2026-04-02 12:49:39
@@ -148,23 +148,25 @@
 ERROR:  block number 7 is out of range
 DROP TABLE test2;
 SELECT * FROM bt_page_items('test1_a_idx', -1);
-ERROR:  invalid block number -1
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', -1);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 0);
-ERROR:  block 0 is a meta page
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', 0);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 1);
--[ RECORD 1 ]-----------------------
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pageinspect/expected/btree.out /tmp/cirrus-ci-build/contrib/pageinspect/results/bt...
--- /tmp/cirrus-ci-build/contrib/pageinspect/expected/btree.out	2026-04-02 12:43:07.342863797 +0000
+++ /tmp/cirrus-ci-build/contrib/pageinspect/results/btree.out	2026-04-02 12:48:52.470389854 +0000
@@ -148,23 +148,25 @@
 ERROR:  block number 7 is out of range
 DROP TABLE test2;
 SELECT * FROM bt_page_items('test1_a_idx', -1);
-ERROR:  invalid block number -1
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', -1);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 0);
-ERROR:  block 0 is a meta page
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', 0);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 1);
--[ RECORD 1 ]-----------------------
...
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/contrib/pageinspect/expected/btree.out /home/postgres/postgres/build/testrun/pageinspec...
--- /home/postgres/postgres/contrib/pageinspect/expected/btree.out	Thu Apr  2 12:43:46 2026
+++ /home/postgres/postgres/build/testrun/pageinspect/regress/results/btree.out	Thu Apr  2 12:51:58 2026
@@ -148,23 +148,25 @@
 ERROR:  block number 7 is out of range
 DROP TABLE test2;
 SELECT * FROM bt_page_items('test1_a_idx', -1);
-ERROR:  invalid block number -1
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', -1);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 0);
-ERROR:  block 0 is a meta page
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', 0);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 1);
--[ RECORD 1 ]-----------------------
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/contrib/pageinspect/expected/btree.out /tmp/cirrus-ci-build/build/testrun/pageinspect/regr...
--- /tmp/cirrus-ci-build/contrib/pageinspect/expected/btree.out	2026-04-02 12:43:10.827020000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pageinspect/regress/results/btree.out	2026-04-02 12:49:23.537096000 +0000
@@ -148,23 +148,25 @@
 ERROR:  block number 7 is out of range
 DROP TABLE test2;
 SELECT * FROM bt_page_items('test1_a_idx', -1);
-ERROR:  invalid block number -1
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', -1);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 0);
-ERROR:  block 0 is a meta page
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', 0);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 1);
--[ RECORD 1 ]-----------------------
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/contrib/pageinspect/expected/btree.out /home/postgres/postgres/build/testrun/pageinspec...
--- /home/postgres/postgres/contrib/pageinspect/expected/btree.out	2026-04-02 12:44:36.790353011 +0000
+++ /home/postgres/postgres/build/testrun/pageinspect/regress/results/btree.out	2026-04-02 12:48:32.349272776 +0000
@@ -148,23 +148,25 @@
 ERROR:  block number 7 is out of range
 DROP TABLE test2;
 SELECT * FROM bt_page_items('test1_a_idx', -1);
-ERROR:  invalid block number -1
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', -1);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 0);
-ERROR:  block 0 is a meta page
+ERROR:  function bt_page_items(unknown, integer) does not exist
+LINE 1: SELECT * FROM bt_page_items('test1_a_idx', 0);
+                      ^
+DETAIL:  No function of that name accepts the given number of arguments.
 SELECT * FROM bt_page_items('test1_a_idx', 1);
--[ RECORD 1 ]-----------------------
...
58/6371 Allowing ALTER COLUMN TYPE for columns in publication column lists
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/publication.out C:/cirrus/build/testrun/test_plan_advic...
--- C:/cirrus/src/test/regress/expected/publication.out	2026-03-31 21:57:50.416932100 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/publication.out	2026-03-31 22:02:33.7612132...
@@ -850,6 +850,8 @@
 -- test that ALTER COLUMN ALTER [ SET DATA ] TYPE is rejected when the column is in a row filter
 CREATE TABLE testpub_rf_tbl8 (id int PRIMARY KEY, x int, y int, z int);
 CREATE PUBLICATION testpub9 FOR TABLE testpub_rf_tbl8 WHERE (x > 100 AND y < 200);
+WARNING:  logical decoding must be enabled to publish logical changes
+HINT:  Before creating subscriptions, ensure that "wal_level" is set to "replica" or higher.
 SET client_min_messages = 'ERROR';
 -- fail
 ALTER TABLE testpub_rf_tbl8 ALTER COLUMN x TYPE bigint;
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/publication.out /Users/admin/pgsql/build/testrun/test_plan_advice/...
--- /Users/admin/pgsql/src/test/regress/expected/publication.out	2026-03-31 21:58:17
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/publication.out	2026-03-31 22:01:1...
@@ -850,6 +850,8 @@
 -- test that ALTER COLUMN ALTER [ SET DATA ] TYPE is rejected when the column is in a row filter
 CREATE TABLE testpub_rf_tbl8 (id int PRIMARY KEY, x int, y int, z int);
 CREATE PUBLICATION testpub9 FOR TABLE testpub_rf_tbl8 WHERE (x > 100 AND y < 200);
+WARNING:  logical decoding must be enabled to publish logical changes
+HINT:  Before creating subscriptions, ensure that "wal_level" is set to "replica" or higher.
 SET client_min_messages = 'ERROR';
 -- fail
 ALTER TABLE testpub_rf_tbl8 ALTER COLUMN x TYPE bigint;
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/publication.out /tmp/cirrus-ci-build/build/testrun/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/publication.out	2026-03-31 21:57:21.393951572 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/publication.out	2026-03-31 22:01...
@@ -850,6 +850,8 @@
 -- test that ALTER COLUMN ALTER [ SET DATA ] TYPE is rejected when the column is in a row filter
 CREATE TABLE testpub_rf_tbl8 (id int PRIMARY KEY, x int, y int, z int);
 CREATE PUBLICATION testpub9 FOR TABLE testpub_rf_tbl8 WHERE (x > 100 AND y < 200);
+WARNING:  logical decoding must be enabled to publish logical changes
+HINT:  Before creating subscriptions, ensure that "wal_level" is set to "replica" or higher.
 SET client_min_messages = 'ERROR';
 -- fail
 ALTER TABLE testpub_rf_tbl8 ALTER COLUMN x TYPE bigint;
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/publication.out /home/postgres/postgres/build/testrun/test_pl...
--- /home/postgres/postgres/src/test/regress/expected/publication.out	Tue Mar 31 21:58:03 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/publication.out	Tue Mar 31 22...
@@ -850,6 +850,8 @@
 -- test that ALTER COLUMN ALTER [ SET DATA ] TYPE is rejected when the column is in a row filter
 CREATE TABLE testpub_rf_tbl8 (id int PRIMARY KEY, x int, y int, z int);
 CREATE PUBLICATION testpub9 FOR TABLE testpub_rf_tbl8 WHERE (x > 100 AND y < 200);
+WARNING:  logical decoding must be enabled to publish logical changes
+HINT:  Before creating subscriptions, ensure that "wal_level" is set to "replica" or higher.
 SET client_min_messages = 'ERROR';
 -- fail
 ALTER TABLE testpub_rf_tbl8 ALTER COLUMN x TYPE bigint;
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/publication.out /tmp/cirrus-ci-build/build/testrun/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/publication.out	2026-03-31 21:58:36.173020000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/publication.out	2026-03-31 22:02...
@@ -850,6 +850,8 @@
 -- test that ALTER COLUMN ALTER [ SET DATA ] TYPE is rejected when the column is in a row filter
 CREATE TABLE testpub_rf_tbl8 (id int PRIMARY KEY, x int, y int, z int);
 CREATE PUBLICATION testpub9 FOR TABLE testpub_rf_tbl8 WHERE (x > 100 AND y < 200);
+WARNING:  logical decoding must be enabled to publish logical changes
+HINT:  Before creating subscriptions, ensure that "wal_level" is set to "replica" or higher.
 SET client_min_messages = 'ERROR';
 -- fail
 ALTER TABLE testpub_rf_tbl8 ALTER COLUMN x TYPE bigint;
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/publication.out /home/postgres/postgres/build/testrun/test_pl...
--- /home/postgres/postgres/src/test/regress/expected/publication.out	2026-03-31 21:58:11.584161925 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/publication.out	2026-03-31 22...
@@ -850,6 +850,8 @@
 -- test that ALTER COLUMN ALTER [ SET DATA ] TYPE is rejected when the column is in a row filter
 CREATE TABLE testpub_rf_tbl8 (id int PRIMARY KEY, x int, y int, z int);
 CREATE PUBLICATION testpub9 FOR TABLE testpub_rf_tbl8 WHERE (x > 100 AND y < 200);
+WARNING:  logical decoding must be enabled to publish logical changes
+HINT:  Before creating subscriptions, ensure that "wal_level" is set to "replica" or higher.
 SET client_min_messages = 'ERROR';
 -- fail
 ALTER TABLE testpub_rf_tbl8 ALTER COLUMN x TYPE bigint;
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/publication.out /tmp/cirrus-ci-build/src/test/modules/test_plan_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/publication.out	2026-03-31 21:57:57.464090763 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/publication.out	2026-03-31 22:06:39.4911112...
@@ -850,6 +850,8 @@
 -- test that ALTER COLUMN ALTER [ SET DATA ] TYPE is rejected when the column is in a row filter
 CREATE TABLE testpub_rf_tbl8 (id int PRIMARY KEY, x int, y int, z int);
 CREATE PUBLICATION testpub9 FOR TABLE testpub_rf_tbl8 WHERE (x > 100 AND y < 200);
+WARNING:  logical decoding must be enabled to publish logical changes
+HINT:  Before creating subscriptions, ensure that "wal_level" is set to "replica" or higher.
 SET client_min_messages = 'ERROR';
 -- fail
 ALTER TABLE testpub_rf_tbl8 ALTER COLUMN x TYPE bigint;
58/6431 [BUG#19384] Fix Server crash at textout
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-03-31 07:54:42.672034400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-03-31 07:59:57.846183500 +0000
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/recovery/027_strea...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-03-31 07:54:42.672034400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-03-31 08:03:18.380514200 +0000
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/regress/regress/re...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-03-31 07:54:42.672034400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2026-03-31 07:59:47.670892400 +0000
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/test_plan_advice/0...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-03-31 07:54:42.672034400 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-03-31 07:59:59.111825500 ...
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indirect_toast.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/indirect_toast.out	2026-03-31 07:53:55
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indirect_toast.out	2026-03-31 07:59:40
@@ -140,15 +140,8 @@
 
 INSERT INTO indtoasttest(descr, f1, f2) VALUES('one-toasted,one-null, via indirect', repeat('1234567890',30000), NULL);
 SELECT substring(indtoasttest::text, 1, 200) FROM indtoasttest;
-                                                                                                substring              ...
------------------------------------------------------------------------------------------------------------------------...
- (two-compressed,8,--12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678...
- (two-toasted,8,--12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901...
- ("one-compressed,one-null",8,,1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678...
- ("one-toasted,one-null",8,,1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901...
- ("one-toasted,one-null, via indirect",0,123456789012345678901234567890123456789012345678901234567890123456789012345678...
-(5 rows)
-
+ERROR:  type indtoasttest has changed
+DETAIL:  The composite value was created using a previous definition of type indtoasttest.
 -- check we didn't screw with main/toast tuple visibility
 VACUUM FREEZE indtoasttest;
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-03-31 07:53:55
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-03-31 08:02:16
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-03-31 07:53:55
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2026-03-31 07:59:57
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/test_plan_advice/001...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-03-31 07:53:55
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-03-31 08:00:11
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-03-31 07:54:37.829103157 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-03-31 07:59:26.678948783...
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-03-31 07:54:37.829103157 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-03-31 08:01:23.9439347...
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-03-31 07:54:37.829103157 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-03-31 07:59:32.282986489 +0000
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-03-31 07:54:37.829103157 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-03-31 07:59:33...
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/pg_upgrade...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-03-31 07:54:19.970180635 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-03-31 07:57:58.423316...
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/recovery/0...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-03-31 07:54:19.970180635 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-03-31 07:58:58.0116...
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/regress/re...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-03-31 07:54:19.970180635 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	2026-03-31 07:57:52.798691425 +0000
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/test_plan_...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-03-31 07:54:19.970180635 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-03-31 07:58...
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-03-31 07:54:07.669915015 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2026-03-31 08:04:20.431127572 +0000
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/modules/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-03-31 07:54:07.669915015 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/indexing.out	2026-03-31 08:05:04.951067554 ...
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-03-31 07:54:07.669915015 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2026-03-31 08:05:34.263022590 +0000
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/regress/results/index...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-03-31 07:54:07.669915015 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2026-03-31 08:01:26.991234713 +0000
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/pg_upgrade...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	Tue Mar 31 07:54:45 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	Tue Mar 31 07:59:28 2026
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/recovery/0...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	Tue Mar 31 07:54:45 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	Tue Mar 31 08:02:27 2026
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/regress/re...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	Tue Mar 31 07:54:45 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	Tue Mar 31 07:59:23 2026
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/test_plan_...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	Tue Mar 31 07:54:45 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	Tue Mar 31 07:59...
@@ -1677,6 +1677,8 @@
 create index row_image_index
     on test_pg_wholerow_index ((row_image(test_pg_wholerow_index)));
 insert into test_pg_wholerow_index values (2, 'addition', 0);
+ERROR:  type test_pg_wholerow_index has changed
+DETAIL:  The composite value was created using a previous definition of type test_pg_wholerow_index.
 drop index row_image_index;
 drop function row_image(test_pg_wholerow_index);
 drop table test_pg_wholerow_index;
58/5992 Fix ALTER TABLE DROP EXPRESSION with ONLY option
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/build/testrun/pg_upgra...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:12.116237497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_stored.out	2026-03-31 05:18:06.2...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:12.116237497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-03-31 05:18:14....
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/build/testrun/recovery...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:12.116237497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_stored.out	2026-03-31 05:19:50...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:12.116237497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-03-31 05:19:5...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/build/testrun/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:12.116237497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_stored.out	2026-03-31 05:18:01.824277746 +0000
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:12.116237497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2026-03-31 05:18:11.984101757 +0000
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/build/testrun/test_pla...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:12.116237497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_stored.out	2026-03-31 ...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/test_pl...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:12.116237497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-03-31...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_stored.out C:/cirrus/build/testrun/pg_upgrade...
--- C:/cirrus/src/test/regress/expected/generated_stored.out	2026-03-31 05:14:33.416023900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_stored.out	2026-03-31 05:18:07.392225600 +0...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/pg_upgrad...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2026-03-31 05:14:33.417002700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-03-31 05:18:29.877577800 +...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_stored.out C:/cirrus/build/testrun/recovery/0...
--- C:/cirrus/src/test/regress/expected/generated_stored.out	2026-03-31 05:14:33.416023900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/generated_stored.out	2026-03-31 05:21:46.610451400 ...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/recovery/...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2026-03-31 05:14:33.417002700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-03-31 05:22:03.146572200...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_stored.out C:/cirrus/build/testrun/regress/re...
--- C:/cirrus/src/test/regress/expected/generated_stored.out	2026-03-31 05:14:33.416023900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/generated_stored.out	2026-03-31 05:17:57.113914400 +0000
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/regress/r...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2026-03-31 05:14:33.417002700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/generated_virtual.out	2026-03-31 05:18:22.444481200 +0000
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_stored.out C:/cirrus/build/testrun/test_plan_...
--- C:/cirrus/src/test/regress/expected/generated_stored.out	2026-03-31 05:14:33.416023900 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_stored.out	2026-03-31 05:18:03.74...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/test_plan...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2026-03-31 05:14:33.417002700 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-03-31 05:18:25.5...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_stored.out /Users/admin/pgsql/build/testrun/pg_upgrade/0...
--- /Users/admin/pgsql/src/test/regress/expected/generated_stored.out	2026-03-31 05:12:20
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_stored.out	2026-03-31 05:15:52
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/pg_upgrade/...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2026-03-31 05:12:20
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-03-31 05:16:05
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_stored.out /Users/admin/pgsql/build/testrun/recovery/027...
--- /Users/admin/pgsql/src/test/regress/expected/generated_stored.out	2026-03-31 05:12:20
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/generated_stored.out	2026-03-31 05:18:01
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/recovery/02...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2026-03-31 05:12:20
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-03-31 05:18:07
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_stored.out /Users/admin/pgsql/build/testrun/regress/regr...
--- /Users/admin/pgsql/src/test/regress/expected/generated_stored.out	2026-03-31 05:12:20
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/generated_stored.out	2026-03-31 05:15:44
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/regress/reg...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2026-03-31 05:12:20
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/generated_virtual.out	2026-03-31 05:15:58
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_stored.out /Users/admin/pgsql/build/testrun/test_plan_ad...
--- /Users/admin/pgsql/src/test/regress/expected/generated_stored.out	2026-03-31 05:12:20
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_stored.out	2026-03-31 05...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/test_plan_a...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2026-03-31 05:12:20
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-03-31 0...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/build/testrun/pg_upgra...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:37.855417000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_stored.out	2026-03-31 05:17:02.0...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:37.856041000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-03-31 05:17:30....
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/build/testrun/recovery...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:37.855417000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_stored.out	2026-03-31 05:18:16...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:37.856041000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-03-31 05:18:5...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/build/testrun/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:37.855417000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_stored.out	2026-03-31 05:17:00.973263000 +0000
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:37.856041000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2026-03-31 05:17:21.448158000 +0000
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/build/testrun/test_pla...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:37.855417000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_stored.out	2026-03-31 ...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/test_pl...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:37.856041000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-03-31...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:12:36.388768791 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/generated_stored.out	2026-03-31 05:20:41.063553464 +0000
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tm...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:12:36.392782989 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/generated_virtual.out	2026-03-31 05:20:58.598895162 +0000
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/src/test/modules/test_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:12:36.388768791 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/generated_stored.out	2026-03-31 05:21:37.33...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/modules/test...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:12:36.392782989 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/generated_virtual.out	2026-03-31 05:21:56.6...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/src/test/recovery/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:12:36.388768791 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/generated_stored.out	2026-03-31 05:22:14.105634805 +0000
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/recovery/tmp...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:12:36.392782989 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/generated_virtual.out	2026-03-31 05:22:39.049631836 +0000
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out /tmp/cirrus-ci-build/src/test/regress/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_stored.out	2026-03-31 05:12:36.388768791 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/generated_stored.out	2026-03-31 05:17:50.523380994 +0000
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/regress/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-03-31 05:12:36.392782989 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/generated_virtual.out	2026-03-31 05:18:04.195711278 +0000
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_stored.out /home/postgres/postgres/build/testrun/pg...
--- /home/postgres/postgres/src/test/regress/expected/generated_stored.out	Tue Mar 31 05:13:21 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_stored.out	Tue Mar 31 05:17:3...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/p...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Tue Mar 31 05:13:21 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	Tue Mar 31 05:17:...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_stored.out /home/postgres/postgres/build/testrun/re...
--- /home/postgres/postgres/src/test/regress/expected/generated_stored.out	Tue Mar 31 05:13:21 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_stored.out	Tue Mar 31 05:19...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Tue Mar 31 05:13:21 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	Tue Mar 31 05:2...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_stored.out /home/postgres/postgres/build/testrun/re...
--- /home/postgres/postgres/src/test/regress/expected/generated_stored.out	Tue Mar 31 05:13:21 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_stored.out	Tue Mar 31 05:17:17 2026
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Tue Mar 31 05:13:21 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_virtual.out	Tue Mar 31 05:17:32 2026
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_stored.out /home/postgres/postgres/build/testrun/te...
--- /home/postgres/postgres/src/test/regress/expected/generated_stored.out	Tue Mar 31 05:13:21 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_stored.out	Tue Mar ...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/t...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Tue Mar 31 05:13:21 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	Tue Mar...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_stored.out /home/postgres/postgres/build/testrun/pg...
--- /home/postgres/postgres/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:36.647799097 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_stored.out	2026-03-31 05:16:4...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/p...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:36.649383339 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-03-31 05:16:...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_stored.out /home/postgres/postgres/build/testrun/re...
--- /home/postgres/postgres/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:36.647799097 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_stored.out	2026-03-31 05:17...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:36.649383339 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-03-31 05:1...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_stored.out /home/postgres/postgres/build/testrun/re...
--- /home/postgres/postgres/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:36.647799097 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_stored.out	2026-03-31 05:16:38.977264808 +00...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:36.649383339 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_virtual.out	2026-03-31 05:16:52.460580808 +0...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_stored.out /home/postgres/postgres/build/testrun/te...
--- /home/postgres/postgres/src/test/regress/expected/generated_stored.out	2026-03-31 05:13:36.647799097 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_stored.out	2026-03-...
@@ -1381,6 +1381,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
                     Table "generated_stored_tests.gtest30"
  Column |  Type   | Collation | Nullable |              Default               
diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/t...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2026-03-31 05:13:36.649383339 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-03...
@@ -1306,6 +1306,7 @@
 CREATE TABLE gtest30_1 () INHERITS (gtest30);
 ALTER TABLE ONLY gtest30 ALTER COLUMN b DROP EXPRESSION;  -- error
 ERROR:  ALTER TABLE / DROP EXPRESSION must be applied to child tables too
+HINT:  Do not specify the ONLY keyword.
 \d gtest30
...
58/6180 minor error message enhance: print RLS policy name when only one permissive policy exists
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out	2026-03-16 08:44:43.184529032 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rowsecurity.out	2026-03-16 08:46:41.791450...
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out	2026-03-16 08:44:43.184529032 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rowsecurity.out	2026-03-16 08:48:09.5919...
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out	2026-03-16 08:44:43.184529032 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rowsecurity.out	2026-03-16 08:46:41.319442399 +0000
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rowsecurity.out C:/cirrus/build/testrun/pg_upgrade/002_...
--- C:/cirrus/src/test/regress/expected/rowsecurity.out	2026-03-16 08:45:49.686450500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rowsecurity.out	2026-03-16 08:49:33.505518400 +0000
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rowsecurity.out C:/cirrus/build/testrun/recovery/027_st...
--- C:/cirrus/src/test/regress/expected/rowsecurity.out	2026-03-16 08:45:49.686450500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/rowsecurity.out	2026-03-16 08:53:17.772518200 +0000
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rowsecurity.out C:/cirrus/build/testrun/regress/regress...
--- C:/cirrus/src/test/regress/expected/rowsecurity.out	2026-03-16 08:45:49.686450500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/rowsecurity.out	2026-03-16 08:49:26.787266300 +0000
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/rowsecurity.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/rowsecurity.out	2026-03-16 08:43:36
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rowsecurity.out	2026-03-16 08:48:09
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/rowsecurity.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/rowsecurity.out	2026-03-16 08:43:36
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/rowsecurity.out	2026-03-16 08:49:44
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/rowsecurity.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/rowsecurity.out	2026-03-16 08:43:36
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/rowsecurity.out	2026-03-16 08:48:00
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out	2026-03-16 08:44:10.982607716 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/rowsecurity.out	2026-03-16 08:50:21.276285168 +0000
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out	2026-03-16 08:44:10.982607716 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/rowsecurity.out	2026-03-16 08:51:40.020653026 +0000
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out /tmp/cirrus-ci-build/src/test/regress/results/ro...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out	2026-03-16 08:44:10.982607716 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/rowsecurity.out	2026-03-16 08:47:26.869960324 +0000
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rowsecurity.out /home/postgres/postgres/build/testrun/pg_upgr...
--- /home/postgres/postgres/src/test/regress/expected/rowsecurity.out	2026-03-16 08:44:12.242438414 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rowsecurity.out	2026-03-16 08:46:48.606...
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rowsecurity.out /home/postgres/postgres/build/testrun/recover...
--- /home/postgres/postgres/src/test/regress/expected/rowsecurity.out	2026-03-16 08:44:12.242438414 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/rowsecurity.out	2026-03-16 08:47:35.0...
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rowsecurity.out /home/postgres/postgres/build/testrun/regress...
--- /home/postgres/postgres/src/test/regress/expected/rowsecurity.out	2026-03-16 08:44:12.242438414 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/rowsecurity.out	2026-03-16 08:46:42.390685934 +0000
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out	2026-03-16 08:43:40.110034000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rowsecurity.out	2026-03-16 08:46:12.815188...
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out	2026-03-16 08:43:40.110034000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rowsecurity.out	2026-03-16 08:47:30.9565...
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rowsecurity.out	2026-03-16 08:43:40.110034000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rowsecurity.out	2026-03-16 08:46:07.276312000 +0000
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rowsecurity.out /home/postgres/postgres/build/testrun/pg_upgr...
--- /home/postgres/postgres/src/test/regress/expected/rowsecurity.out	Mon Mar 16 08:45:54 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rowsecurity.out	Mon Mar 16 08:49:46 202...
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rowsecurity.out /home/postgres/postgres/build/testrun/recover...
--- /home/postgres/postgres/src/test/regress/expected/rowsecurity.out	Mon Mar 16 08:45:54 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/rowsecurity.out	Mon Mar 16 08:52:24 2...
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rowsecurity.out /home/postgres/postgres/build/testrun/regress...
--- /home/postgres/postgres/src/test/regress/expected/rowsecurity.out	Mon Mar 16 08:45:54 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/rowsecurity.out	Mon Mar 16 08:49:32 2026
@@ -2462,7 +2462,7 @@
 -- DO SELECT requires SELECT rights, should fail for non-novel
 INSERT INTO document VALUES (33, (SELECT cid from category WHERE cname = 'science fiction'), 1, 'regress_rls_bob', 'ano...
     ON CONFLICT (did) DO SELECT RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy for table "document"
+ERROR:  new row violates row-level security policy "p1_select_novels" for table "document"
 -- DO SELECT with WHERE and EXCLUDED reference
 INSERT INTO document VALUES (1, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT WHERE excluded.dlevel = 1 RETURNING did, dauthor, dtitle;
@@ -2482,7 +2482,7 @@
 -- should fail UPDATE USING policy for novel with dlevel = 2
 INSERT INTO document VALUES (2, (SELECT cid from category WHERE cname = 'novel'), 1, 'regress_rls_bob', 'another novel'...
     ON CONFLICT (did) DO SELECT FOR UPDATE RETURNING did, dauthor, dtitle;
-ERROR:  new row violates row-level security policy (USING expression) for table "document"
+ERROR:  new row violates row-level security policy "p3_update_novels" (USING expression) for table "document"
 SET SESSION AUTHORIZATION regress_rls_alice;
 DROP POLICY p1_select_novels ON document;
...
58/6438 Introduces pg_stat_recovery system view
Windows - Server 2022, VS 2019 - Meson & ninja
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upg...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-03-05 13:38:03.975801600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-03-05 13:42:07.356468800 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/recovery/027_stream_r...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-03-05 13:38:03.975801600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-03-05 13:45:18.455596400 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/regress/regress/resul...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-03-05 13:38:03.975801600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/rules.out	2026-03-05 13:42:02.622102300 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
Windows - Server 2022, MinGW64 - Meson
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upg...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-03-05 13:38:46.331014200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-03-05 13:43:13.565681900 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/recovery/027_stream_r...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-03-05 13:38:46.331014200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-03-05 13:46:43.936385700 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/regress/regress/resul...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-03-05 13:38:46.331014200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/rules.out	2026-03-05 13:43:09.668214300 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
macOS - Sequoia - Meson
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgra...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2026-03-05 13:37:45
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-03-05 13:42:10
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/recovery/027_stream_reg...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2026-03-05 13:37:45
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-03-05 13:44:44
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/regress/regress/results...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2026-03-05 13:37:45
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/rules.out	2026-03-05 13:42:07
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
Linux - Debian Trixie - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-03-05 13:38:18.270283413 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-03-05 13:42:09.828461569 +0...
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-03-05 13:38:18.270283413 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-03-05 13:43:37.712479825 ...
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-03-05 13:38:18.270283413 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rules.out	2026-03-05 13:42:12.236378638 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/pg_upgrade/00...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	2026-03-05 13:38:19.725972967 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-03-05 13:41:13.324636632...
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/recovery/027_...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	2026-03-05 13:38:19.725972967 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-03-05 13:41:55.8830575...
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/regress/regre...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	2026-03-05 13:38:19.725972967 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/rules.out	2026-03-05 13:41:05.669779476 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
FreeBSD - Meson
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-03-05 13:39:26.008380000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-03-05 13:42:42.101215000 +0...
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-03-05 13:39:26.008380000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-03-05 13:44:11.157434000 ...
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-03-05 13:39:26.008380000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rules.out	2026-03-05 13:42:40.610305000 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
Linux - Debian Trixie - Autoconf
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-03-05 13:37:56.195452277 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/rules.out	2026-03-05 13:45:08.475254452 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-03-05 13:37:56.195452277 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/rules.out	2026-03-05 13:46:59.810399442 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/src/test/regress/results/rules.ou...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-03-05 13:37:56.195452277 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/rules.out	2026-03-05 13:43:10.509173746 +0000
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
OpenBSD - Meson
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/pg_upgrade/00...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	Thu Mar  5 13:38:26 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	Thu Mar  5 13:42:10 2026
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/recovery/027_...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	Thu Mar  5 13:38:26 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/rules.out	Thu Mar  5 13:44:17 2026
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
regress
diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/regress/regre...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	Thu Mar  5 13:38:26 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/rules.out	Thu Mar  5 13:42:05 2026
@@ -2137,7 +2137,7 @@
     pause_state,
     wal_source
    FROM pg_stat_get_recovery() s(promote_triggered, last_replayed_read_lsn, last_replayed_end_lsn, last_replayed_tli, r...
-  WHERE (s.promote_triggered IS NOT NULL);
+  WHERE (promote_triggered IS NOT NULL);
 pg_stat_recovery_prefetch| SELECT stats_reset,
     prefetch,
     hit,
54/5087 Doc: Move and modify standalone hot backups section
NetBSD - Meson
regress
diff -U3 /home/postgres/postgres/contrib/postgres_fdw/expected/query_cancel.out /home/postgres/postgres/build/testrun/po...
--- /home/postgres/postgres/contrib/postgres_fdw/expected/query_cancel.out	2026-02-28 22:03:49.812858512 +0000
+++ /home/postgres/postgres/build/testrun/postgres_fdw/regress/results/query_cancel.out	2026-02-28 22:11:07.097715363 +0...
@@ -30,5 +30,5 @@
 SET LOCAL statement_timeout = '10ms';
 -- This would take very long if not canceled:
 SELECT count(*) FROM ft1 a CROSS JOIN ft1 b CROSS JOIN ft1 c CROSS JOIN ft1 d;
-ERROR:  canceling statement due to statement timeout
+ERROR:  canceling statement due to user request
 COMMIT;