database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

Fix assertion in collation version lookup.

Browse Source 
Commit 257836a7 included an assertion that a version lookup routine is
not trying to look up "C" or "POSIX", but that case is reachable with
the user-facing SQL function pg_collation_actual_version().  Remove the
assertion.
This commit is contained in:
Thomas Munro
2020-11-08 20:43:45 +13:00
parent 8cff66d309
commit d50e3b1f8d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/utils/adt/pg_locale.c
View File

@ -1731,15 +1731,14 @@ get_collation_actual_version(char collprovider, const char *collcollate)
/* /*
* Get provider-specific collation version string for a given collation OID. * Get provider-specific collation version string for a given collation OID.
* Return NULL if the provider doesn't support versions. * Return NULL if the provider doesn't support versions, or the collation is
* unversioned (for example "C").
*/ */
char * char *
get_collation_version_for_oid(Oid oid) get_collation_version_for_oid(Oid oid)
{ {
HeapTuple tp; HeapTuple tp;
char *version = NULL; char *version;
Assert(oid != C_COLLATION_OID && oid != POSIX_COLLATION_OID);
if (oid == DEFAULT_COLLATION_OID) if (oid == DEFAULT_COLLATION_OID)
{ {