diff -U3 /home/pavel/src/postgresql.master/contrib/dblink/expected/dblink.out /home/pavel/src/postgresql.master/contrib/dblink/results/dblink.out
--- /home/pavel/src/postgresql.master/contrib/dblink/expected/dblink.out	2019-03-02 17:00:24.472460214 +0100
+++ /home/pavel/src/postgresql.master/contrib/dblink/results/dblink.out	2019-03-26 19:46:27.161403374 +0100
@@ -984,23 +984,21 @@
 	ADD COLUMN col4 INT NOT NULL DEFAULT 42;
 SELECT dblink_build_sql_insert('test_dropped', '1', 1,
                                ARRAY['1'::TEXT], ARRAY['2'::TEXT]);
-                          dblink_build_sql_insert                          
----------------------------------------------------------------------------
- INSERT INTO test_dropped(id,col2b,col3,col4) VALUES('2','113','foo','42')
-(1 row)
-
+ERROR:  column "........pg.dropped.1........" does not exist
+LINE 1: SELECT "........pg.dropped.1........", id, "........pg.dropp...
+               ^
+QUERY:  SELECT "........pg.dropped.1........", id, "........pg.dropped.3........", col2b, col3, col4 FROM test_dropped WHERE "........pg.dropped.1........" = '1'
 SELECT dblink_build_sql_update('test_dropped', '1', 1,
                                ARRAY['1'::TEXT], ARRAY['2'::TEXT]);
-                                  dblink_build_sql_update                                  
--------------------------------------------------------------------------------------------
- UPDATE test_dropped SET id = '2', col2b = '113', col3 = 'foo', col4 = '42' WHERE id = '2'
-(1 row)
-
+ERROR:  column "........pg.dropped.1........" does not exist
+LINE 1: SELECT "........pg.dropped.1........", id, "........pg.dropp...
+               ^
+QUERY:  SELECT "........pg.dropped.1........", id, "........pg.dropped.3........", col2b, col3, col4 FROM test_dropped WHERE "........pg.dropped.1........" = '1'
 SELECT dblink_build_sql_delete('test_dropped', '1', 1,
                                ARRAY['2'::TEXT]);
-         dblink_build_sql_delete         
------------------------------------------
- DELETE FROM test_dropped WHERE id = '2'
+                       dblink_build_sql_delete                       
+---------------------------------------------------------------------
+ DELETE FROM test_dropped WHERE "........pg.dropped.1........" = '2'
 (1 row)
 
 -- test local mimicry of remote GUC values that affect datatype I/O