PostgreSQL Patch Tester

diff -U3 /home/postgres/postgres/src/test/regress/expected/subselect.out /home/postgres/postgres/build/testrun/recovery/...
--- /home/postgres/postgres/src/test/regress/expected/subselect.out	2026-06-01 17:07:29.177649285 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2026-06-01 17:09:46.097...
@@ -2036,159 +2036,82 @@
 --
 BEGIN;
 CREATE TYPE t_rec AS (x numeric);
+ERROR:  type "t_rec" already exists
 CREATE TEMP TABLE pdt (id int, a t_rec);
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 INSERT INTO pdt VALUES
   (1, ROW(1.00)::t_rec),
   (2, ROW(1.0)::t_rec),
   (3, ROW(2)::t_rec);
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 -- DISTINCT ON: conflict, qual stays in outer query
 EXPLAIN (COSTS OFF)
 SELECT * FROM (SELECT DISTINCT ON (a) id, a FROM pdt ORDER BY a, id) s
 WHERE a *= ROW(1.0)::t_rec;
-              QUERY PLAN               
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2026-06-01 17:07:28.919396115 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/subselect.out	2026-06-01 17:15:29.350395983 +0000
@@ -2036,159 +2036,82 @@
 --
 BEGIN;
 CREATE TYPE t_rec AS (x numeric);
+ERROR:  type "t_rec" already exists
 CREATE TEMP TABLE pdt (id int, a t_rec);
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 INSERT INTO pdt VALUES
   (1, ROW(1.00)::t_rec),
   (2, ROW(1.0)::t_rec),
   (3, ROW(2)::t_rec);
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 -- DISTINCT ON: conflict, qual stays in outer query
 EXPLAIN (COSTS OFF)
 SELECT * FROM (SELECT DISTINCT ON (a) id, a FROM pdt ORDER BY a, id) s
 WHERE a *= ROW(1.0)::t_rec;
-              QUERY PLAN               
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress-r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2026-06-01 16:27:47.933623000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/select_parallel.out	2026-06-01 16:37:08.513911000...
@@ -593,9 +593,9 @@
          ->  Gather (actual rows=9800.00 loops=10)
                Workers Planned: 4
                Workers Launched: 4
-               ->  Parallel Seq Scan on tenk1 (actual rows=1960.00 loops=50)
+               ->  Parallel Seq Scan on tenk1 (actual rows=2882.35 loops=34)
                      Filter: (hundred > 1)
-                     Rows Removed by Filter: 40
+                     Rows Removed by Filter: 59
 (11 rows)
 
 alter table tenk2 reset (parallel_workers);

diff -U3 /home/postgres/postgres/src/test/regress/expected/plancache.out /home/postgres/postgres/build/testrun/test_plan...
--- /home/postgres/postgres/src/test/regress/expected/plancache.out	2026-06-01 15:37:20.279325703 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/plancache.out	2026-06-01 15:4...
@@ -451,7 +451,6 @@
 -- during this execution, which should force replanning without errors.
 update inval_during_pruning_signal set create_idx = true;
 explain (verbose, costs off) execute inval_during_pruning_q;
-NOTICE:  creating index on partition inval_during_pruning_p1
                                 QUERY PLAN                                 
 ---------------------------------------------------------------------------
  Append

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-31 17:50:19.975968877 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/select.out	2026-05-31 17:58:32.406714251 +0000
@@ -2,14 +2,14 @@
 -- SELECT statements
 --
 CREATE EXTENSION pg_stat_statements;
+ERROR:  extension "pg_stat_statements" has no installation script nor update path for version "1.14"
 SET pg_stat_statements.track_utility = FALSE;
 SET pg_stat_statements.track_planning = TRUE;
 SELECT pg_stat_statements_reset() IS NOT NULL AS t;
- t 
----
- t
-(1 row)
-
+ERROR:  function pg_stat_statements_reset() does not exist
+LINE 1: SELECT pg_stat_statements_reset() IS NOT NULL AS t;
+               ^
+DETAIL:  There is no function of that name.
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/test_ddl_deparse/expected/create_extension.out /tmp/cirrus-ci-build/src/t...
--- /tmp/cirrus-ci-build/src/test/modules/test_ddl_deparse/expected/create_extension.out	2026-05-31 17:50:21.627968912 +...
+++ /tmp/cirrus-ci-build/src/test/modules/test_ddl_deparse/results/create_extension.out	2026-05-31 17:58:35.990708071 +0...
@@ -2,4 +2,4 @@
 --- CREATE_EXTENSION
 ---
 CREATE EXTENSION pg_stat_statements;
-NOTICE:  DDL test: type simple, tag CREATE EXTENSION
+ERROR:  extension "pg_stat_statements" has no installation script nor update path for version "1.14"

diff -U3 /home/postgres/postgres/src/test/regress/expected/date.out /home/postgres/postgres/build/testrun/test_plan_advi...
--- /home/postgres/postgres/src/test/regress/expected/date.out	2026-05-31 13:32:13.154793184 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/date.out	2026-05-31 13:33:11....
@@ -1,1536 +1,2 @@
---
--- DATE
---
-CREATE TABLE DATE_TBL (f1 date);
-INSERT INTO DATE_TBL VALUES ('1957-04-09');
-INSERT INTO DATE_TBL VALUES ('1957-06-13');
-INSERT INTO DATE_TBL VALUES ('1996-02-28');
-INSERT INTO DATE_TBL VALUES ('1996-02-29');
-INSERT INTO DATE_TBL VALUES ('1996-03-01');
-INSERT INTO DATE_TBL VALUES ('1996-03-02');
-INSERT INTO DATE_TBL VALUES ('1997-02-28');
-INSERT INTO DATE_TBL VALUES ('1997-02-29');
-ERROR:  date/time field value out of range: "1997-02-29"
-LINE 1: INSERT INTO DATE_TBL VALUES ('1997-02-29');
-                                     ^
-INSERT INTO DATE_TBL VALUES ('1997-03-01');
...

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-05-31 11:28:55.110280000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2026-05-31 11:39:23.7216590...
@@ -12966,8 +12966,7 @@
   FROM postgres_fdw_get_connections(true);
  server_name | closed | remote_backend_pid 
 -------------+--------+--------------------
- loopback    | f      | t
-(1 row)
+(0 rows)
 
 -- After terminating the remote backend, since the connection is closed,
 -- "closed" should be TRUE, or NULL if the connection status check
@@ -12983,8 +12982,7 @@
   FROM postgres_fdw_get_connections(true);
  server_name | closed | remote_backend_pid 
 -------------+--------+--------------------
- loopback    | t      | t
-(1 row)
+(0 rows)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/incremental_matview.out C:/cirrus/build/testrun/pg_upgr...
--- C:/cirrus/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:16.952357200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-31 05:25:42.313678500...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/incremental_matview.out C:/cirrus/build/testrun/recover...
--- C:/cirrus/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:16.952357200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-31 05:29:43.1960107...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/incremental_matview.out C:/cirrus/build/testrun/regress...
--- C:/cirrus/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:16.952357200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/incremental_matview.out	2026-05-31 05:25:36.112985300 +0000
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/incremental_matview.out C:/cirrus/build/testrun/test_pl...
--- C:/cirrus/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:16.952357200 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-05-31 05:25:41...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out /Users/admin/pgsql/build/testrun/pg_upgrad...
--- /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out	2026-05-31 05:20:33
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-31 05:26:53
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out /Users/admin/pgsql/build/testrun/recovery/...
--- /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out	2026-05-31 05:20:33
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-31 05:28:4...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out /Users/admin/pgsql/build/testrun/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out	2026-05-31 05:20:33
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/incremental_matview.out	2026-05-31 05:26:49
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out /Users/admin/pgsql/build/testrun/test_plan...
--- /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out	2026-05-31 05:20:33
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-05-31...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:18.581622911 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-31 05:26:3...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/recov...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:18.581622911 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-31 05:28...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:18.581622911 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/incremental_matview.out	2026-05-31 05:26:29.648393454 +00...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/test_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:18.581622911 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-05-...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:15.700393000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-31 05:25:1...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/recov...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:15.700393000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-31 05:26...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:15.700393000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/incremental_matview.out	2026-05-31 05:25:03.827821000 +00...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/test_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:15.700393000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-05-...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /home/postgres/postgres/src/test/regress/expected/incremental_matview.out /home/postgres/postgres/build/testrun...
--- /home/postgres/postgres/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:40.864677627 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-31 05:2...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /home/postgres/postgres/src/test/regress/expected/incremental_matview.out /home/postgres/postgres/build/testrun...
--- /home/postgres/postgres/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:40.864677627 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-31 05...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /home/postgres/postgres/src/test/regress/expected/incremental_matview.out /home/postgres/postgres/build/testrun...
--- /home/postgres/postgres/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:40.864677627 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/incremental_matview.out	2026-05-31 05:24:55.926112296 ...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /home/postgres/postgres/src/test/regress/expected/incremental_matview.out /home/postgres/postgres/build/testrun...
--- /home/postgres/postgres/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:40.864677627 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:25.430109571 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/incremental_matview.out	2026-05-31 05:30:20.565769961 +000...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/src/test/modules/te...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:25.430109571 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/incremental_matview.out	2026-05-31 05:33:36...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/src/test/recovery/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:25.430109571 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/incremental_matview.out	2026-05-31 05:32:37.049716856 +0000
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/src/test/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-31 05:21:25.430109571 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/incremental_matview.out	2026-05-31 05:27:47.685846531 +0000
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

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-31 00:43:34.551149400 +0000
+++ C:/cirrus/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-31 00:53:49.964206300 +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

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-31 00:43:24
+++ /Users/admin/pgsql/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-31 00:50:21
@@ -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

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-31 00:43:30.913913697 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-31 00:48:45.972040833 +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

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-31 00:43:39.906504790 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/results/guc_privs.out	2026-05-31 00:51:33.474593210 +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

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-31 00:43:49.460238952 +0000
+++ /home/postgres/postgres/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-31 00:46:50.137671686 +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

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-31 00:43:29.451504000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-31 00:48:13.359436000 +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

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-05-29 04:15:50.119810500 +0000
+++ C:/cirrus/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:23:56.552652700 +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
...

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-05-29 04:15:16
+++ /Users/admin/pgsql/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:20:50
@@ -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
...

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-05-29 04:16:12.944027376 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:22:47.935802167 +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
...

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-05-29 04:16:14.222286765 +0000
+++ /home/postgres/postgres/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:20:11.431788728 +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
...

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-05-29 04:15:34.546408934 +0000
+++ /tmp/cirrus-ci-build/src/pl/plpgsql/src/results/plpgsql_misc.out	2026-05-29 04:19:37.441094521 +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
...

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-05-29 04:15:53.914402000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:20:10.074342000 +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
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/foreign_key.out /tmp/cirrus-ci-build/build/testrun/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/foreign_key.out	2026-05-27 14:46:57.030826226 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/foreign_key.out	2026-05-27 14:51...
@@ -262,3453 +262,7 @@
 
 -- Delete another row from PK TABLE
 DELETE FROM PKTABLE WHERE ptest1=5 and ptest2=10;
--- Check FKTABLE (should be no change)
-SELECT * FROM FKTABLE;
- ftest1 | ftest2 | ftest3 
---------+--------+--------
-      1 |      3 |      5
-      2 |      4 |      8
-      3 |      6 |     12
-        |        |      0
-     -1 |     -2 |      4
-(5 rows)
-
--- Update a row from PK TABLE
-UPDATE PKTABLE SET ptest1=1 WHERE ptest1=2;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/foreign_key.out C:/cirrus/build/testrun/pg_upgrade/002_...
--- C:/cirrus/src/test/regress/expected/foreign_key.out	2026-05-27 14:47:38.829100200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/foreign_key.out	2026-05-27 14:52:55.150134200 +0000
@@ -1612,2103 +1612,7 @@
 update pp set f1=f1+1;
 insert into cc values(13);
 update pp set f1=f1+1;
-update pp set f1=f1+1; -- fail
-ERROR:  update or delete on table "pp" violates foreign key constraint "cc_f1_fkey" on table "cc"
-DETAIL:  Key (f1)=(13) is still referenced from table "cc".
-delete from pp where f1 = 13; -- fail
-ERROR:  update or delete on table "pp" violates foreign key constraint "cc_f1_fkey" on table "cc"
-DETAIL:  Key (f1)=(13) is still referenced from table "cc".
-drop table pp, cc;
-create temp table pp (f1 int primary key);
-create temp table cc (f1 int references pp on update restrict on delete restrict);
-insert into pp values(12);
-insert into pp values(11);
-update pp set f1=f1+1;
-insert into cc values(13);
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/graph_table.out C:/cirrus/build/testrun/regress/regress...
--- C:/cirrus/src/test/regress/expected/graph_table.out	2026-05-27 14:47:38.839785400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/graph_table.out	2026-05-27 14:52:53.775135400 +0000
@@ -890,158 +890,7 @@
 CREATE TABLE ptne1 PARTITION OF ptne FOR VALUES IN (1, 2);
 CREATE TABLE ptne2 PARTITION OF ptne FOR VALUES IN (3);
 INSERT INTO ptne VALUES (1, 1, 2, 100), (2, 2, 3, 200), (3, 3, 1, 300);
-CREATE PROPERTY GRAPH g4
-    VERTEX TABLES (ptnv)
-    EDGE TABLES (
-        ptne
-            SOURCE KEY (src) REFERENCES ptnv(id)
-            DESTINATION KEY (dest) REFERENCES ptnv(id)
-    );
-SELECT * FROM GRAPH_TABLE (g4 MATCH (s IS ptnv)-[e IS ptne]->(d IS ptnv) COLUMNS (s.val, e.val, d.val)) ORDER BY 1, 2, ...
- val | val | val 
------+-----+-----
-  10 | 100 |  20
-  20 | 200 |  30
-  30 | 300 |  10
...

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-05-25 19:25:24
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:32:01
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:24
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:33:47
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:24
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/rules.out	2026-05-25 19:31:58
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/test_plan_advice/001_re...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2026-05-25 19:25:24
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:32:01
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:26:22.567120700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:30:19.587412100 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:26:22.567120700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:33:48.821293900 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:26:22.567120700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/rules.out	2026-05-25 19:30:08.469247300 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/test_plan_advice/001_...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-05-25 19:26:22.567120700 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:30:13.404303200 +00...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:12.260263912 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:30:16.857921530 +0...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:12.260263912 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:31:49.478009585 ...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:12.260263912 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rules.out	2026-05-25 19:30:17.593922505 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:12.260263912 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:30:19.55...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:10.250268000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:29:10.030700000 +0...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:10.250268000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:30:43.078920000 ...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:10.250268000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rules.out	2026-05-25 19:29:09.928914000 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:10.250268000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:29:09.87...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:13.920292372 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/rules.out	2026-05-25 19:33:30.446858193 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/src/test/modules/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:13.920292372 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/rules.out	2026-05-25 19:35:36.799282777 +00...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:13.920292372 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/rules.out	2026-05-25 19:35:34.723276952 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:13.920292372 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/rules.out	2026-05-25 19:31:27.542170594 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:59.945520780 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:29:16.327871888...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:59.945520780 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:30:07.8442491...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-05-25 19:25:59.945520780 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/rules.out	2026-05-25 19:29:15.862858321 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/test_plan_adv...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	2026-05-25 19:25:59.945520780 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:29:20...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

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-24 11:01:18.279820400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:06:34.633954600 +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
...

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-24 11:01:18.279820400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:09:50.552407900 +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
...

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-24 11:01:18.279820400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:06:06.139822200 +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
...

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-24 11:01:18.279820400 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:06:28.167646100 ...
@@ -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
...

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-24 11:01:13
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:06: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
...

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-24 11:01:13
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:09:06
@@ -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
...

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-24 11:01:13
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:06: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
...

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-24 11:01:13
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:06:49
@@ -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
...

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-24 11:01:14.759560371 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:06:58.310831594...
@@ -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
...

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-24 11:01:14.759560371 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:08:39.3547629...
@@ -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
...

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-24 11:01:14.759560371 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:06:58.038831805 +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
...

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-24 11:01:14.759560371 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:07:06...
@@ -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
...

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-24 11:01:14.631983000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:06:50.781580000...
@@ -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
...

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-24 11:01:14.631983000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:08:41.6434830...
@@ -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
...

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-24 11:01:14.631983000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:07:12.354098000 +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
...

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-24 11:01:14.631983000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:07:22...
@@ -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
...

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-24 11:01:22.352965665 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2026-05-24 11:09:48.709621941 +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
...

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-24 11:01:22.352965665 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/indexing.out	2026-05-24 11:12:36.861554054 ...
@@ -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
...

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-24 11:01:22.352965665 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2026-05-24 11:12:55.049569599 +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
...

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-24 11:01:22.352965665 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2026-05-24 11:09:49.289620653 +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
...

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-24 11:01:42.700845704 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:05:37.730504...
@@ -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
...

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-24 11:01:42.700845704 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:06:35.3269...
@@ -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
...

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-24 11:01:42.700845704 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:05:31.258216841 +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
...

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-24 11:01:42.700845704 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:05...
@@ -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
...

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-24 08:43:55.842219800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:49:47.513014100 +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)
...

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-24 08:43:55.842219800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:53:44.739267600 +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)
...

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-24 08:43:55.842219800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:49:41.907623400 +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)
...

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-24 08:43:55.842219800 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:49:34.868967400 ...
@@ -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)
...

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-24 08:43:14
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:47:55
@@ -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)
...

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-24 08:43:14
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:50:31
@@ -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)
...

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-24 08:43:14
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:47:56
@@ -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)
...

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-24 08:43:14
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:48:02
@@ -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)
...

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-24 08:43:44.838754761 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:49:00.380089319...
@@ -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)
...

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-24 08:43:44.838754761 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:50:33.9072683...
@@ -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)
...

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-24 08:43:44.838754761 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:48:59.576098630 +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)
...

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-24 08:43:44.838754761 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:49:06...
@@ -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)
...

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-24 08:43:18.402352305 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2026-05-24 08:53:29.515985330 +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)
...

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-24 08:43:18.402352305 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/indexing.out	2026-05-24 08:55:32.397937452 ...
@@ -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)
...

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-24 08:43:18.402352305 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2026-05-24 08:55:00.853220793 +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)
...

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-24 08:43:18.402352305 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2026-05-24 08:50:21.421872802 +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)
...

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-24 08:44:35.224771940 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:48:26.487456...
@@ -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)
...

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-24 08:44:35.224771940 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:49:13.1701...
@@ -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)
...

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-24 08:44:35.224771940 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:48:15.447190701 +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)
...

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-24 08:44:35.224771940 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:48...
@@ -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)
...

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-24 08:43:46.276595000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:49:55.651272000...
@@ -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)
...

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-24 08:43:46.276595000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:51:20.8855050...
@@ -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)
...

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-24 08:43:46.276595000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:49:51.307955000 +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)
...

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-24 08:43:46.276595000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:50:04...
@@ -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)
...

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-05-15 22:13:00.003948155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-05-15 22:16:20.8...
@@ -3321,15 +3321,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
...

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-05-15 22:13:00.003948155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	2026-05-15 22:17:55...
@@ -3321,15 +3321,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
...

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-05-15 22:13:00.003948155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/collate.icu.utf8.out	2026-05-15 22:16:17.094675949 +0000
@@ -3321,15 +3321,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
...

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-05-15 22:13:00.003948155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	2026-05-15 ...
@@ -3321,15 +3321,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
...

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-05-15 22:13:01
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-05-15 22:17:35
@@ -3321,15 +3321,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
...

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-05-15 22:13:01
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	2026-05-15 22:20:49
@@ -3321,15 +3321,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
...

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-05-15 22:13:01
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/collate.icu.utf8.out	2026-05-15 22:17:29
@@ -3321,15 +3321,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
...

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-05-15 22:13:01
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	2026-05-15 22...
@@ -3321,15 +3321,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
...

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-05-15 22:13:28.525096246 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-05-15 22:16:1...
@@ -3321,15 +3321,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
...

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-05-15 22:13:16.985472000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-05-15 22:16:28.9...
@@ -3321,15 +3321,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
...

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-05-15 22:13:16.985472000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	2026-05-15 22:18:10...
@@ -3321,15 +3321,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
...

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-05-15 22:13:16.985472000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/collate.icu.utf8.out	2026-05-15 22:16:23.767570000 +0000
@@ -3321,15 +3321,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
...

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-05-15 22:13:16.985472000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	2026-05-15 ...
@@ -3321,15 +3321,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
...

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-05-15 22:13:14.141404063 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/collate.icu.utf8.out	2026-05-15 22:20:41.984142334 +0000
@@ -3321,15 +3321,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
...

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-05-15 22:13:14.141404063 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/collate.icu.utf8.out	2026-05-15 22:23:21.26...
@@ -3321,15 +3321,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
...

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-05-15 22:13:14.141404063 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/collate.icu.utf8.out	2026-05-15 22:22:11.244103875 +0000
@@ -3321,15 +3321,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
...

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-05-15 22:13:14.141404063 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/collate.icu.utf8.out	2026-05-15 22:18:02.308055377 +0000
@@ -3321,15 +3321,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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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;

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                 ...

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)
 
...

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)
 
...

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)))
...

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)
 
...

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)
 
...

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)
 
...

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                 ...

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;
...

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)
 
...

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)))
...

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;
...

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;
...

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;
...

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                 ...

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)
 
...

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)
 
...

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)))
...

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)
 
...

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)
 
...

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)
 
...

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                 ...

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)
 
...

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)
 
...

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)
 
...

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)
 
...

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                 ...

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)
 
...

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)
 
...

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)))
...

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)
 
...

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)
 
...

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)
 
...

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                 ...

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)
 
...

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)
 
...

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)))
...

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)
 
...

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)
 
...

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)
 
...

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                 ...

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)
 
...

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)
 
...

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)))
...

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)
 
...

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)
 
...

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)
 
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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:
...

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 ]-----------------------
...

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 ]-----------------------
...

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 ]-----------------------
...

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 ]-----------------------
...

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 ]-----------------------
...

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 ]-----------------------
...

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 ]-----------------------
...

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
...

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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;
...

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,