diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out
--- C:/cirrus/src/test/regress/expected/create_index.out	2025-01-31 18:27:56.492769300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2025-01-31 18:30:29.385189000 +0000
@@ -1198,13 +1198,9 @@
 CREATE INDEX gin_relopts_test ON array_index_op_test USING gin (i)
   WITH (FASTUPDATE=on, GIN_PENDING_LIST_LIMIT=128);
 \d+ gin_relopts_test
-                Index "public.gin_relopts_test"
- Column |  Type   | Key? | Definition | Storage | Stats target 
---------+---------+------+------------+---------+--------------
- i      | integer | yes  | i          | plain   | 
-gin, for table "public.array_index_op_test"
-Options: fastupdate=on, gin_pending_list_limit=128
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 --
 -- HASH
 --
@@ -1288,19 +1284,13 @@
     "unique_idx4" UNIQUE, btree (i) NULLS NOT DISTINCT
 
 \d unique_idx3
-      Index "public.unique_idx3"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- i      | integer | yes  | i
-unique, btree, for table "public.unique_tbl"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d unique_idx4
-      Index "public.unique_idx4"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- i      | integer | yes  | i
-unique nulls not distinct, btree, for table "public.unique_tbl"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 SELECT pg_get_indexdef('unique_idx3'::regclass);
                            pg_get_indexdef                            
 ----------------------------------------------------------------------
@@ -1339,12 +1329,9 @@
     "func_index_index" UNIQUE, btree (textcat(f1, f2))
 
 \d func_index_index
-     Index "public.func_index_index"
- Column  | Type | Key? |   Definition    
----------+------+------+-----------------
- textcat | text | yes  | textcat(f1, f2)
-unique, btree, for table "public.func_index_heap"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 --
 -- Same test, expressional index
 --
@@ -1371,12 +1358,9 @@
     "func_index_index" UNIQUE, btree ((f1 || f2))
 
 \d func_index_index
-  Index "public.func_index_index"
- Column | Type | Key? | Definition 
---------+------+------+------------
- expr   | text | yes  | (f1 || f2)
-unique, btree, for table "public.func_index_heap"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 -- this should fail because of unsafe column type (anonymous record)
 create index on func_index_heap ((f1 || f2), (row(f1, f2)));
 ERROR:  column "row" has pseudo-type record
@@ -1560,13 +1544,9 @@
     "cwi_uniq_idx" PRIMARY KEY, btree (a, b)
 
 \d cwi_uniq_idx
-            Index "public.cwi_uniq_idx"
- Column |         Type          | Key? | Definition 
---------+-----------------------+------+------------
- a      | integer               | yes  | a
- b      | character varying(10) | yes  | b
-primary key, btree, for table "public.cwi_test"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 CREATE UNIQUE INDEX cwi_uniq2_idx ON cwi_test(b , a);
 ALTER TABLE cwi_test DROP CONSTRAINT cwi_uniq_idx,
 	ADD CONSTRAINT cwi_replaced_pkey PRIMARY KEY
@@ -1583,13 +1563,9 @@
     "cwi_replaced_pkey" PRIMARY KEY, btree (b, a)
 
 \d cwi_replaced_pkey
-          Index "public.cwi_replaced_pkey"
- Column |         Type          | Key? | Definition 
---------+-----------------------+------+------------
- b      | character varying(10) | yes  | b
- a      | integer               | yes  | a
-primary key, btree, for table "public.cwi_test"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 DROP INDEX cwi_replaced_pkey;	-- Should fail; a constraint depends on it
 ERROR:  cannot drop index cwi_replaced_pkey because constraint cwi_replaced_pkey on table cwi_test requires it
 HINT:  You can drop constraint cwi_replaced_pkey on table cwi_test instead.
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/index_including.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/index_including.out
--- C:/cirrus/src/test/regress/expected/index_including.out	2025-01-31 18:27:56.528492100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/index_including.out	2025-01-31 18:30:28.078109400 +0000
@@ -20,15 +20,9 @@
 (2 rows)
 
 \d tbl_include_reg_idx
-  Index "public.tbl_include_reg_idx"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- c1     | integer | yes  | c1
- c2     | integer | yes  | c2
- c3     | integer | no   | c3
- c4     | box     | no   | c4
-btree, for table "public.tbl_include_reg"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 -- Unique index and unique constraint
 CREATE TABLE tbl_include_unique1 (c1 int, c2 int, c3 int, c4 box);
 INSERT INTO tbl_include_unique1 SELECT x, 2*x, 3*x, box('4,4,4,4') FROM generate_series(1,10) AS x;
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out
--- C:/cirrus/src/test/regress/expected/alter_table.out	2025-01-31 18:27:56.464352200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2025-01-31 18:31:58.341707200 +0000
@@ -105,14 +105,9 @@
 HINT:  Alter statistics on table column instead.
 ALTER INDEX attmp_idx ALTER COLUMN 2 SET STATISTICS 1000;
 \d+ attmp_idx
-                        Index "public.attmp_idx"
- Column |       Type       | Key? | Definition | Storage | Stats target 
---------+------------------+------+------------+---------+--------------
- a      | integer          | yes  | a          | plain   | 
- expr   | double precision | yes  | (d + e)    | plain   | 1000
- b      | cstring          | yes  | b          | plain   | 
-btree, for table "public.attmp"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 ALTER INDEX attmp_idx ALTER COLUMN 3 SET STATISTICS 1000;
 ERROR:  cannot alter statistics on non-expression column "b" of index "attmp_idx"
 HINT:  Alter statistics on table column instead.
@@ -2304,13 +2299,9 @@
     "test_storage_idx" btree (b, a)
 
 \d+ test_storage_idx
-                Index "public.test_storage_idx"
- Column |  Type   | Key? | Definition | Storage  | Stats target 
---------+---------+------+------------+----------+--------------
- b      | integer | yes  | b          | plain    | 
- a      | text    | yes  | a          | external | 
-btree, for table "public.test_storage"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 -- ALTER COLUMN TYPE with a check constraint and a child table (bug #13779)
 CREATE TABLE test_inh_check (a float check (a > 10.2), b float);
 CREATE TABLE test_inh_check_child() INHERITS(test_inh_check);
@@ -3794,12 +3785,9 @@
  integer |     1 |       1 | 2147483647 |         1 | no      |     1
 Owned by: public.test_add_column.c5
 
- Index "public.test_add_column_pkey"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- c3     | integer | yes  | c3
-primary key, btree, for table "public.test_add_column"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 DROP TABLE test_add_column;
 \d test_add_column*
 -- assorted cases with multiple ALTER TABLE steps
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out
--- C:/cirrus/src/test/regress/expected/indexing.out	2025-01-31 18:27:56.534548100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2025-01-31 18:32:10.298755500 +0000
@@ -103,24 +103,13 @@
     "idxpart1_b_c_idx" btree (b, c)
 
 \d+ idxpart1_a_idx
-                 Index "public.idxpart1_a_idx"
- Column |  Type   | Key? | Definition | Storage | Stats target 
---------+---------+------+------------+---------+--------------
- a      | integer | yes  | a          | plain   | 
-Partition of: idxparti 
-No partition constraint
-btree, for table "public.idxpart1"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d+ idxpart1_b_c_idx
-                Index "public.idxpart1_b_c_idx"
- Column |  Type   | Key? | Definition | Storage  | Stats target 
---------+---------+------+------------+----------+--------------
- b      | integer | yes  | b          | plain    | 
- c      | text    | yes  | c          | extended | 
-Partition of: idxparti2 
-No partition constraint
-btree, for table "public.idxpart1"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 -- Forbid ALTER TABLE when attaching or detaching an index to a partition.
 create index idxpart_c on only idxpart (c);
 create index idxpart1_c on idxpart1 (c);
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/tablespace.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/tablespace.out
--- C:/cirrus/src/test/regress/expected/tablespace.out	2025-01-31 18:27:56.641790200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/tablespace.out	2025-01-31 18:32:21.104900100 +0000
@@ -269,13 +269,9 @@
 Tablespace: "regress_tblspace"
 
 \d testschema.foo_idx
-      Index "testschema.foo_idx"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- i      | integer | yes  | i
-btree, for table "testschema.foo"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 --
 -- partitioned table
 --
@@ -378,24 +374,13 @@
     "part1_a_idx" btree (a), tablespace "regress_tblspace"
 
 \d testschema.part_a_idx
-Partitioned index "testschema.part_a_idx"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- a      | integer | yes  | a
-btree, for table "testschema.part"
-Number of partitions: 2 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d+ testschema.part_a_idx
-           Partitioned index "testschema.part_a_idx"
- Column |  Type   | Key? | Definition | Storage | Stats target 
---------+---------+------+------------+---------+--------------
- a      | integer | yes  | a          | plain   | 
-btree, for table "testschema.part"
-Partitions: testschema.part1_a_idx,
-            testschema.part2_a_idx
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 -- partitioned rels cannot specify the default tablespace.  These fail:
 CREATE TABLE testschema.dflt (a int PRIMARY KEY) PARTITION BY LIST (a) TABLESPACE pg_default;
 ERROR:  cannot specify default tablespace for partitioned relations
@@ -419,69 +404,41 @@
 ALTER TABLE testschema.test_default_tab ADD CONSTRAINT test_index3 PRIMARY KEY (id);
 ALTER TABLE testschema.test_default_tab ADD CONSTRAINT test_index4 UNIQUE (id) USING INDEX TABLESPACE regress_tblspace;
 \d testschema.test_index1
-   Index "testschema.test_index1"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-   Index "testschema.test_index2"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-   Index "testschema.test_index3"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-primary key, btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-   Index "testschema.test_index4"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-unique, btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 -- use a custom tablespace for default_tablespace
 SET default_tablespace TO regress_tblspace;
 -- tablespace should not change if no rewrite
 ALTER TABLE testschema.test_default_tab ALTER id TYPE bigint;
 \d testschema.test_index1
-   Index "testschema.test_index1"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-   Index "testschema.test_index2"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-   Index "testschema.test_index3"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-primary key, btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-   Index "testschema.test_index4"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-unique, btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 SELECT * FROM testschema.test_default_tab;
  id 
 ----
@@ -491,35 +448,21 @@
 -- tablespace should not change even if there is an index rewrite
 ALTER TABLE testschema.test_default_tab ALTER id TYPE int;
 \d testschema.test_index1
-    Index "testschema.test_index1"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-    Index "testschema.test_index2"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-    Index "testschema.test_index3"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-primary key, btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-    Index "testschema.test_index4"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-unique, btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 SELECT * FROM testschema.test_default_tab;
  id 
 ----
@@ -531,67 +474,39 @@
 -- tablespace should not change if no rewrite
 ALTER TABLE testschema.test_default_tab ALTER id TYPE int;
 \d testschema.test_index1
-    Index "testschema.test_index1"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-    Index "testschema.test_index2"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-    Index "testschema.test_index3"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-primary key, btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-    Index "testschema.test_index4"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-unique, btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 -- tablespace should not change even if there is an index rewrite
 ALTER TABLE testschema.test_default_tab ALTER id TYPE bigint;
 \d testschema.test_index1
-   Index "testschema.test_index1"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-   Index "testschema.test_index2"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-   Index "testschema.test_index3"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-primary key, btree, for table "testschema.test_default_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-   Index "testschema.test_index4"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-unique, btree, for table "testschema.test_default_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 DROP TABLE testschema.test_default_tab;
 -- check that default_tablespace doesn't affect ALTER TABLE index rebuilds
 -- (this time with a partitioned table)
@@ -605,77 +520,41 @@
 ALTER TABLE testschema.test_default_tab_p ADD CONSTRAINT test_index3 PRIMARY KEY (id);
 ALTER TABLE testschema.test_default_tab_p ADD CONSTRAINT test_index4 UNIQUE (id) USING INDEX TABLESPACE regress_tblspace;
 \d testschema.test_index1
-Partitioned index "testschema.test_index1"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- val    | bigint | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-Partitioned index "testschema.test_index2"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- val    | bigint | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-Partitioned index "testschema.test_index3"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-primary key, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-Partitioned index "testschema.test_index4"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-unique, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 -- use a custom tablespace for default_tablespace
 SET default_tablespace TO regress_tblspace;
 -- tablespace should not change if no rewrite
 ALTER TABLE testschema.test_default_tab_p ALTER val TYPE bigint;
 \d testschema.test_index1
-Partitioned index "testschema.test_index1"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- val    | bigint | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-Partitioned index "testschema.test_index2"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- val    | bigint | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-Partitioned index "testschema.test_index3"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-primary key, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-Partitioned index "testschema.test_index4"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-unique, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 SELECT * FROM testschema.test_default_tab_p;
  id | val 
 ----+-----
@@ -685,39 +564,21 @@
 -- tablespace should not change even if there is an index rewrite
 ALTER TABLE testschema.test_default_tab_p ALTER val TYPE int;
 \d testschema.test_index1
-Partitioned index "testschema.test_index1"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- val    | integer | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-Partitioned index "testschema.test_index2"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- val    | integer | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-Partitioned index "testschema.test_index3"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-primary key, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-Partitioned index "testschema.test_index4"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-unique, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 SELECT * FROM testschema.test_default_tab_p;
  id | val 
 ----+-----
@@ -729,75 +590,39 @@
 -- tablespace should not change if no rewrite
 ALTER TABLE testschema.test_default_tab_p ALTER val TYPE int;
 \d testschema.test_index1
-Partitioned index "testschema.test_index1"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- val    | integer | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-Partitioned index "testschema.test_index2"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- val    | integer | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-Partitioned index "testschema.test_index3"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-primary key, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-Partitioned index "testschema.test_index4"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-unique, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 -- tablespace should not change even if there is an index rewrite
 ALTER TABLE testschema.test_default_tab_p ALTER val TYPE bigint;
 \d testschema.test_index1
-Partitioned index "testschema.test_index1"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- val    | bigint | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index2
-Partitioned index "testschema.test_index2"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- val    | bigint | yes  | val
-btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index3
-Partitioned index "testschema.test_index3"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-primary key, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_index4
-Partitioned index "testschema.test_index4"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- id     | bigint | yes  | id
-unique, btree, for table "testschema.test_default_tab_p"
-Number of partitions: 1 (Use \d+ to list them.)
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 DROP TABLE testschema.test_default_tab_p;
 -- check that default_tablespace affects index additions in ALTER TABLE
 CREATE TABLE testschema.test_tab(id int) TABLESPACE regress_tblspace;
@@ -807,20 +632,13 @@
 SET default_tablespace TO '';
 ALTER TABLE testschema.test_tab ADD CONSTRAINT test_tab_pkey PRIMARY KEY (id);
 \d testschema.test_tab_unique
-  Index "testschema.test_tab_unique"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-unique, btree, for table "testschema.test_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_tab_pkey
-   Index "testschema.test_tab_pkey"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- id     | integer | yes  | id
-primary key, btree, for table "testschema.test_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 SELECT * FROM testschema.test_tab;
  id 
 ----
@@ -837,52 +655,30 @@
 SET default_tablespace TO '';
 CREATE INDEX test_tab_b_idx ON testschema.test_tab (b);
 \d testschema.test_tab_unique
-  Index "testschema.test_tab_unique"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- a      | integer | yes  | a
-unique, btree, for table "testschema.test_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_tab_a_idx
-  Index "testschema.test_tab_a_idx"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- a      | integer | yes  | a
-btree, for table "testschema.test_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_tab_b_idx
-  Index "testschema.test_tab_b_idx"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- b      | integer | yes  | b
-btree, for table "testschema.test_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 ALTER TABLE testschema.test_tab ALTER b TYPE bigint, ADD UNIQUE (c);
 \d testschema.test_tab_unique
-  Index "testschema.test_tab_unique"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- a      | integer | yes  | a
-unique, btree, for table "testschema.test_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_tab_a_idx
-  Index "testschema.test_tab_a_idx"
- Column |  Type   | Key? | Definition 
---------+---------+------+------------
- a      | integer | yes  | a
-btree, for table "testschema.test_tab"
-Tablespace: "regress_tblspace"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 \d testschema.test_tab_b_idx
-  Index "testschema.test_tab_b_idx"
- Column |  Type  | Key? | Definition 
---------+--------+------+------------
- b      | bigint | yes  | b
-btree, for table "testschema.test_tab"
-
+ERROR:  column i.indisvisible does not exist
+LINE 6: i.indisvisible,
+        ^
 DROP TABLE testschema.test_tab;
 -- let's try moving a table from one place to another
 CREATE TABLE testschema.atable AS VALUES (1), (2);