diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-03-22 16:55:32 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-03-22 16:55:32 -0400 |
| commit | 6e197cb2e537880f36828a6c55d0f6df5bf7daa8 (patch) | |
| tree | 72cfdd5c6fbba12577a1c2df45c6ddf18c221905 /src/backend/commands | |
| parent | 37d6d07dda28a5dffcad6ff195ab2c83aaebcc9e (diff) | |
| download | postgresql-6e197cb2e537880f36828a6c55d0f6df5bf7daa8.tar.gz postgresql-6e197cb2e537880f36828a6c55d0f6df5bf7daa8.zip | |
Improve reporting of run-time-detected indeterminate-collation errors.
pg_newlocale_from_collation does not have enough context to give an error
message that's even a little bit useful, so move the responsibility for
complaining up to its callers. Also, reword ERRCODE_INDETERMINATE_COLLATION
error messages in a less jargony, more message-style-guide-compliant
fashion.
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/collationcmds.c | 2 | ||||
| -rw-r--r-- | src/backend/commands/indexcmds.c | 2 | ||||
| -rw-r--r-- | src/backend/commands/view.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index 6dafb7223c4..2a6938fd04b 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -141,7 +141,7 @@ DefineCollation(List *names, List *parameters) /* check that the locales can be loaded */ CommandCounterIncrement(); - pg_newlocale_from_collation(newoid); + (void) pg_newlocale_from_collation(newoid); } /* diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 163980bbfa3..dafa6d5efc1 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -899,7 +899,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo, if (!OidIsValid(attcollation)) ereport(ERROR, (errcode(ERRCODE_INDETERMINATE_COLLATION), - errmsg("no collation was derived for the index expression"), + errmsg("could not determine which collation to use for index expression"), errhint("Use the COLLATE clause to set the collation explicitly."))); } else diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index 250d02605cf..508fb23c9ac 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -139,7 +139,7 @@ DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace) if (!OidIsValid(def->collOid)) ereport(ERROR, (errcode(ERRCODE_INDETERMINATE_COLLATION), - errmsg("no collation was derived for view column \"%s\"", + errmsg("could not determine which collation to use for view column \"%s\"", def->colname), errhint("Use the COLLATE clause to set the collation explicitly."))); } |