diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-05 18:21:12 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-05 18:21:28 -0400 |
| commit | c639d240c00f8d2b6684c03597b30d179d4ab31c (patch) | |
| tree | 3b4c502b2127191cf670b009e2944ee080667313 | |
| parent | 457333d5c2f95e9448a2366dab55aab74514295c (diff) | |
| download | postgresql-c639d240c00f8d2b6684c03597b30d179d4ab31c.tar.gz postgresql-c639d240c00f8d2b6684c03597b30d179d4ab31c.zip | |
Call FDW validator functions even when the options list is empty.
This is useful since a validator might want to require certain options
to be provided. The passed array is an empty text array in this case.
Per suggestion by Laurenz Albe, though this is not quite his patch.
| -rw-r--r-- | src/backend/commands/foreigncmds.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c index 21d52e06ba0..643ba91bfe1 100644 --- a/src/backend/commands/foreigncmds.c +++ b/src/backend/commands/foreigncmds.c @@ -165,8 +165,18 @@ transformGenericOptions(Oid catalogId, result = optionListToArray(resultOptions); - if (OidIsValid(fdwvalidator) && DatumGetPointer(result) != NULL) - OidFunctionCall2(fdwvalidator, result, ObjectIdGetDatum(catalogId)); + if (OidIsValid(fdwvalidator)) + { + Datum valarg = result; + + /* + * Pass a null options list as an empty array, so that validators + * don't have to be declared non-strict to handle the case. + */ + if (DatumGetPointer(valarg) == NULL) + valarg = PointerGetDatum(construct_empty_array(TEXTOID)); + OidFunctionCall2(fdwvalidator, valarg, ObjectIdGetDatum(catalogId)); + } return result; } |