Make the file_fdw validator check that a filename option has been provided.

This was already a runtime failure condition, but it's better to check
at validation time if possible.  Lightly modified version of a patch
by Shigeru Hanada.

diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c
index 466c015107db28b46601b759ad4542d6589a597c..4eb87e651bcb1675f2b5df81c6cbe3ca22ef67f7 100644 (file)
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@ -215,6 +215,14 @@ file_fdw_validator(PG_FUNCTION_ARGS)
         */
        ProcessCopyOptions(NULL, true, other_options);
 
+       /*
+        * Filename option is required for file_fdw foreign tables.
+        */
+       if (catalog == ForeignTableRelationId && filename == NULL)
+               ereport(ERROR,
+                               (errcode(ERRCODE_FDW_DYNAMIC_PARAMETER_VALUE_NEEDED),
+                                errmsg("filename is required for file_fdw foreign tables")));
+
        PG_RETURN_VOID();
 }
 
@@ -286,10 +294,14 @@ fileGetOptions(Oid foreigntableid,
                }
                prev = lc;
        }
+
+       /*
+        * The validator should have checked that a filename was included in the
+        * options, but check again, just in case.
+        */
        if (*filename == NULL)
-               ereport(ERROR,
-                               (errcode(ERRCODE_FDW_UNABLE_TO_CREATE_REPLY),
-                                errmsg("filename is required for file_fdw foreign tables")));
+               elog(ERROR, "filename is required for file_fdw foreign tables");
+
        *other_options = options;
 }
 

diff --git a/contrib/file_fdw/input/file_fdw.source b/contrib/file_fdw/input/file_fdw.source
index 9ff7235a12468f270324419ca65522577a7ca17d..1405752819ced755a64c789013eed41bdff873e3 100644 (file)
--- a/contrib/file_fdw/input/file_fdw.source
+++ b/contrib/file_fdw/input/file_fdw.source
@@ -59,6 +59,7 @@ CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', delimiter
 ');       -- ERROR
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', null '
 ');       -- ERROR
+CREATE FOREIGN TABLE tbl () SERVER file_server;  -- ERROR
 
 CREATE FOREIGN TABLE agg_text (
        a       int2,

diff --git a/contrib/file_fdw/output/file_fdw.source b/contrib/file_fdw/output/file_fdw.source
index 2ba36c936852d3d66643d23f98854e0da5ae3bca..6dd2653d0a7719ffcff0126e7935109b0d0d0a62 100644 (file)
--- a/contrib/file_fdw/output/file_fdw.source
+++ b/contrib/file_fdw/output/file_fdw.source
@@ -75,6 +75,8 @@ ERROR:  COPY delimiter cannot be newline or carriage return
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', null '
 ');       -- ERROR
 ERROR:  COPY null representation cannot use newline or carriage return
+CREATE FOREIGN TABLE tbl () SERVER file_server;  -- ERROR
+ERROR:  filename is required for file_fdw foreign tables
 CREATE FOREIGN TABLE agg_text (
        a       int2,
        b       float4