Merge branch 'per_column_option' into force_not_null

Conflicts:
	contrib/file_fdw/file_fdw.c

diff --cc contrib/file_fdw/file_fdw.c
index 0097bc7f77999b32daf1ee42e0ef78976fc9bb98,224e74ff32100ab1adf72f9075bd45049bad4a5e..ddced257e7228346b0ff671e22dd7533ca8fca7b
--- 1/contrib/file_fdw/file_fdw.c
--- 2/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@@ -390,14 -296,13 +398,16 @@@ fileGetOptions(Oid foreigntableid
        prev = lc;
    }
  
-   /* The filename is required optiono. */
 +  /* Retrieve force_not_null from pg_attribute and append it to the list. */
 +  options = list_concat(options, get_force_not_null(foreigntableid));
 +
+   /*
+    * 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 --cc contrib/file_fdw/input/file_fdw.source
Simple merge

diff --cc contrib/file_fdw/output/file_fdw.source
Simple merge