diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2009-02-27 16:35:31 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2009-02-27 16:35:31 +0000 |
| commit | 109177fe3a5f3609b9adae98ead7517156305ef1 (patch) | |
| tree | 08652c5bfc400792f9022afe2ddf0dcfdf715340 | |
| parent | 29d033f926f2c75e75599d5c51657baa5d2022a3 (diff) | |
| download | postgresql-109177fe3a5f3609b9adae98ead7517156305ef1.tar.gz postgresql-109177fe3a5f3609b9adae98ead7517156305ef1.zip | |
In CREATE CONVERSION, test that the given function is a valid conversion
function for the specified source and destination encodings. We do that by
calling the function with an empty string. If it can't perform the requested
conversion, it will throw an error.
Backport to 7.4 - 8.3. Per bug report #4680 by Denis Afonin.
| -rw-r--r-- | src/backend/commands/conversioncmds.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c index f1f4738084c..c1ac4373565 100644 --- a/src/backend/commands/conversioncmds.c +++ b/src/backend/commands/conversioncmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.32 2008/01/01 19:45:48 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.32.2.1 2009/02/27 16:35:31 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -47,6 +47,7 @@ CreateConversionCommand(CreateConversionStmt *stmt) const char *to_encoding_name = stmt->to_encoding_name; List *func_name = stmt->func_name; static Oid funcargs[] = {INT4OID, INT4OID, CSTRINGOID, INTERNALOID, INT4OID}; + char result[1]; /* Convert list of names to a name and namespace */ namespaceId = QualifiedNameGetCreationNamespace(stmt->conversion_name, @@ -87,6 +88,19 @@ CreateConversionCommand(CreateConversionStmt *stmt) NameListToString(func_name)); /* + * Check that the conversion function is suitable for the requested + * source and target encodings. We do that by calling the function with + * an empty string; the conversion function should throw an error if it + * can't perform the requested conversion. + */ + OidFunctionCall5(funcoid, + Int32GetDatum(from_encoding), + Int32GetDatum(to_encoding), + CStringGetDatum(""), + CStringGetDatum(result), + Int32GetDatum(0)); + + /* * All seem ok, go ahead (possible failure would be a duplicate conversion * name) */ |