From e61a82c949353d9684d037a9a404fbb26b651535 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 13 Nov 2023 14:44:39 -0500 Subject: [PATCH] Adjust file_fdw regression tests for acc95f29ef FREEZE commit Reported-by: Tom Lane Discussion: https://postgr.es/m/2161529.1699899452@sss.pgh.pa.us Backpatch-through: master --- contrib/file_fdw/expected/file_fdw.out | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/file_fdw/expected/file_fdw.out b/contrib/file_fdw/expected/file_fdw.out index 72304e0ff3..86c148a86b 100644 --- a/contrib/file_fdw/expected/file_fdw.out +++ b/contrib/file_fdw/expected/file_fdw.out @@ -51,23 +51,23 @@ CREATE USER MAPPING FOR regress_no_priv_user SERVER file_server; CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'xml'); -- ERROR ERROR: COPY format "xml" not recognized CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'text', quote ':'); -- ERROR -ERROR: COPY quote available only in CSV mode +ERROR: COPY QUOTE requires CSV mode CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'text', escape ':'); -- ERROR -ERROR: COPY escape available only in CSV mode +ERROR: COPY ESCAPE requires CSV mode CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'binary', header 'true'); -- ERROR ERROR: cannot specify HEADER in BINARY mode CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'binary', quote ':'); -- ERROR -ERROR: COPY quote available only in CSV mode +ERROR: COPY QUOTE requires CSV mode CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'binary', escape ':'); -- ERROR -ERROR: COPY escape available only in CSV mode +ERROR: COPY ESCAPE requires CSV mode CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'text', delimiter 'a'); -- ERROR ERROR: COPY delimiter cannot be "a" CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'text', escape '-'); -- ERROR -ERROR: COPY escape available only in CSV mode +ERROR: COPY ESCAPE requires CSV mode CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', quote '-', null '=-='); -- ERROR ERROR: CSV quote character must not appear in the NULL specification CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', delimiter '-', null '=-='); -- ERROR -ERROR: COPY delimiter must not appear in the NULL specification +ERROR: COPY delimiter character must not appear in the NULL specification CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', delimiter '-', quote '-'); -- ERROR ERROR: COPY delimiter and quote must be different CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', delimiter '---'); -- ERROR @@ -138,7 +138,7 @@ CREATE FOREIGN TABLE text_csv ( ) SERVER file_server OPTIONS (format 'text', filename :'filename', null 'NULL'); SELECT * FROM text_csv; -- ERROR -ERROR: COPY force not null available only in CSV mode +ERROR: COPY FORCE_NOT_NULL requires CSV mode ALTER FOREIGN TABLE text_csv OPTIONS (SET format 'csv'); \pset null _null_ SELECT * FROM text_csv;