diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/contrib/postgres_fdw/results/postgres_fdw.out
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2025-03-24 01:50:36.188271192 +0000
+++ /tmp/cirrus-ci-build/contrib/postgres_fdw/results/postgres_fdw.out	2025-03-24 01:57:21.244898839 +0000
@@ -9739,41 +9739,31 @@
                          Foreign table "import_dest1.t1"
  Column |       Type        | Collation | Nullable | Default |    FDW options     
 --------+-------------------+-----------+----------+---------+--------------------
- c1     | integer           |           |          |         | (column_name 'c1')
  c2     | character varying |           | not null |         | (column_name 'c2')
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't1')
 
-                         Foreign table "import_dest1.t2"
- Column |       Type        | Collation | Nullable | Default |    FDW options     
---------+-------------------+-----------+----------+---------+--------------------
- c1     | integer           |           |          |         | (column_name 'c1')
- c2     | character varying |           |          |         | (column_name 'c2')
- c3     | text              | POSIX     |          |         | (column_name 'c3')
+               Foreign table "import_dest1.t2"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't2')
 
-                             Foreign table "import_dest1.t3"
- Column |           Type           | Collation | Nullable | Default |    FDW options     
---------+--------------------------+-----------+----------+---------+--------------------
- c1     | timestamp with time zone |           |          |         | (column_name 'c1')
- c2     | typ1                     |           |          |         | (column_name 'c2')
+               Foreign table "import_dest1.t3"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't3')
 
-                    Foreign table "import_dest1.t4"
- Column |  Type   | Collation | Nullable | Default |    FDW options     
---------+---------+-----------+----------+---------+--------------------
- c1     | integer |           |          |         | (column_name 'c1')
+               Foreign table "import_dest1.t4"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't4')
 
-                           Foreign table "import_dest1.x 4"
- Column |         Type          | Collation | Nullable | Default |     FDW options     
---------+-----------------------+-----------+----------+---------+---------------------
- c1     | double precision      |           |          |         | (column_name 'c1')
- C 2    | text                  |           |          |         | (column_name 'C 2')
- c3     | character varying(42) |           |          |         | (column_name 'c3')
+               Foreign table "import_dest1.x 4"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 'x 4')
 
@@ -9783,11 +9773,9 @@
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 'x 5')
 
-                                  Foreign table "import_dest1.x 6"
- Column |  Type   | Collation | Nullable |               Default               |    FDW options     
---------+---------+-----------+----------+-------------------------------------+--------------------
- c1     | integer |           |          |                                     | (column_name 'c1')
- c2     | integer |           |          | generated always as (c1 * 2) stored | (column_name 'c2')
+               Foreign table "import_dest1.x 6"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 'x 6')
 
@@ -9812,41 +9800,31 @@
                          Foreign table "import_dest2.t1"
  Column |       Type        | Collation | Nullable | Default |    FDW options     
 --------+-------------------+-----------+----------+---------+--------------------
- c1     | integer           |           |          |         | (column_name 'c1')
  c2     | character varying |           | not null |         | (column_name 'c2')
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't1')
 
-                         Foreign table "import_dest2.t2"
- Column |       Type        | Collation | Nullable | Default |    FDW options     
---------+-------------------+-----------+----------+---------+--------------------
- c1     | integer           |           |          | 42      | (column_name 'c1')
- c2     | character varying |           |          |         | (column_name 'c2')
- c3     | text              | POSIX     |          |         | (column_name 'c3')
+               Foreign table "import_dest2.t2"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't2')
 
-                             Foreign table "import_dest2.t3"
- Column |           Type           | Collation | Nullable | Default |    FDW options     
---------+--------------------------+-----------+----------+---------+--------------------
- c1     | timestamp with time zone |           |          | now()   | (column_name 'c1')
- c2     | typ1                     |           |          |         | (column_name 'c2')
+               Foreign table "import_dest2.t3"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't3')
 
-                    Foreign table "import_dest2.t4"
- Column |  Type   | Collation | Nullable | Default |    FDW options     
---------+---------+-----------+----------+---------+--------------------
- c1     | integer |           |          |         | (column_name 'c1')
+               Foreign table "import_dest2.t4"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't4')
 
-                           Foreign table "import_dest2.x 4"
- Column |         Type          | Collation | Nullable | Default |     FDW options     
---------+-----------------------+-----------+----------+---------+---------------------
- c1     | double precision      |           |          |         | (column_name 'c1')
- C 2    | text                  |           |          |         | (column_name 'C 2')
- c3     | character varying(42) |           |          |         | (column_name 'c3')
+               Foreign table "import_dest2.x 4"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 'x 4')
 
@@ -9856,11 +9834,9 @@
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 'x 5')
 
-                                  Foreign table "import_dest2.x 6"
- Column |  Type   | Collation | Nullable |               Default               |    FDW options     
---------+---------+-----------+----------+-------------------------------------+--------------------
- c1     | integer |           |          |                                     | (column_name 'c1')
- c2     | integer |           |          | generated always as (c1 * 2) stored | (column_name 'c2')
+               Foreign table "import_dest2.x 6"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 'x 6')
 
@@ -9884,41 +9860,31 @@
                          Foreign table "import_dest3.t1"
  Column |       Type        | Collation | Nullable | Default |    FDW options     
 --------+-------------------+-----------+----------+---------+--------------------
- c1     | integer           |           |          |         | (column_name 'c1')
  c2     | character varying |           |          |         | (column_name 'c2')
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't1')
 
-                         Foreign table "import_dest3.t2"
- Column |       Type        | Collation | Nullable | Default |    FDW options     
---------+-------------------+-----------+----------+---------+--------------------
- c1     | integer           |           |          |         | (column_name 'c1')
- c2     | character varying |           |          |         | (column_name 'c2')
- c3     | text              |           |          |         | (column_name 'c3')
+               Foreign table "import_dest3.t2"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't2')
 
-                             Foreign table "import_dest3.t3"
- Column |           Type           | Collation | Nullable | Default |    FDW options     
---------+--------------------------+-----------+----------+---------+--------------------
- c1     | timestamp with time zone |           |          |         | (column_name 'c1')
- c2     | typ1                     |           |          |         | (column_name 'c2')
+               Foreign table "import_dest3.t3"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't3')
 
-                    Foreign table "import_dest3.t4"
- Column |  Type   | Collation | Nullable | Default |    FDW options     
---------+---------+-----------+----------+---------+--------------------
- c1     | integer |           |          |         | (column_name 'c1')
+               Foreign table "import_dest3.t4"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 't4')
 
-                           Foreign table "import_dest3.x 4"
- Column |         Type          | Collation | Nullable | Default |     FDW options     
---------+-----------------------+-----------+----------+---------+---------------------
- c1     | double precision      |           |          |         | (column_name 'c1')
- C 2    | text                  |           |          |         | (column_name 'C 2')
- c3     | character varying(42) |           |          |         | (column_name 'c3')
+               Foreign table "import_dest3.x 4"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 'x 4')
 
@@ -9928,11 +9894,9 @@
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 'x 5')
 
-                    Foreign table "import_dest3.x 6"
- Column |  Type   | Collation | Nullable | Default |    FDW options     
---------+---------+-----------+----------+---------+--------------------
- c1     | integer |           |          |         | (column_name 'c1')
- c2     | integer |           |          |         | (column_name 'c2')
+               Foreign table "import_dest3.x 6"
+ Column | Type | Collation | Nullable | Default | FDW options 
+--------+------+-----------+----------+---------+-------------
 Server: loopback
 FDW options: (schema_name 'import_source', table_name 'x 6')
 
@@ -9983,16 +9947,6 @@
 NOTICE:  drop cascades to column Col of table import_source.t5
 IMPORT FOREIGN SCHEMA import_source LIMIT TO (t5)
   FROM SERVER loopback INTO import_dest5;  -- ERROR
-ERROR:  type "public.Colors" does not exist
-LINE 4:   "Col" public."Colors" OPTIONS (column_name 'Col')
-                ^
-QUERY:  CREATE FOREIGN TABLE t5 (
-  c1 integer OPTIONS (column_name 'c1'),
-  c2 text OPTIONS (column_name 'c2') COLLATE pg_catalog."C",
-  "Col" public."Colors" OPTIONS (column_name 'Col')
-) SERVER loopback
-OPTIONS (schema_name 'import_source', table_name 't5');
-CONTEXT:  importing foreign table "t5"
 ROLLBACK;
 BEGIN;
 CREATE SERVER fetch101 FOREIGN DATA WRAPPER postgres_fdw OPTIONS( fetch_size '101' );