diff options
| author | Bruce Momjian <bruce@momjian.us> | 2014-04-22 16:06:37 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2014-04-22 16:06:37 -0400 |
| commit | 7ec73783d88a743799b0c262f1235f772497fb1d (patch) | |
| tree | c59084f67d8b53d2d1e26894fdd16241b7411521 /contrib/file_fdw/file_fdw.c | |
| parent | 4a5d55ec2b711e13438a32d119a809a22ced410b (diff) | |
| download | postgresql-7ec73783d88a743799b0c262f1235f772497fb1d.tar.gz postgresql-7ec73783d88a743799b0c262f1235f772497fb1d.zip | |
copy: update docs for FORCE_NULL and FORCE_NOT_NULL combination
Also update regression tests
Patch by Michael Paquier
Diffstat (limited to 'contrib/file_fdw/file_fdw.c')
| -rw-r--r-- | contrib/file_fdw/file_fdw.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c index 4f84e3bcea8..476e520301a 100644 --- a/contrib/file_fdw/file_fdw.c +++ b/contrib/file_fdw/file_fdw.c @@ -264,11 +264,6 @@ file_fdw_validator(PG_FUNCTION_ARGS) (errcode(ERRCODE_SYNTAX_ERROR), errmsg("conflicting or redundant options"), errhint("option \"force_not_null\" supplied more than once for a column"))); - if(force_null) - ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("conflicting or redundant options"), - errhint("option \"force_not_null\" cannot be used together with \"force_null\""))); force_not_null = def; /* Don't care what the value is, as long as it's a legal boolean */ (void) defGetBoolean(def); @@ -281,11 +276,6 @@ file_fdw_validator(PG_FUNCTION_ARGS) (errcode(ERRCODE_SYNTAX_ERROR), errmsg("conflicting or redundant options"), errhint("option \"force_null\" supplied more than once for a column"))); - if(force_not_null) - ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("conflicting or redundant options"), - errhint("option \"force_null\" cannot be used together with \"force_not_null\""))); force_null = def; (void) defGetBoolean(def); } |