database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Revert "pg_collation_actual_version() -> pg_collation_current_version()."

Browse Source 
This reverts commit 9cf184cc05.  Name
change less well received than anticipated.

Discussion: https://postgr.es/m/afcfb97e-88a1-a540-db95-6c573b93bc2b%40eisentraut.org
This commit is contained in:
Thomas Munro
2021-02-26 15:29:27 +13:00
parent 80ca8464fe
commit 8556267b2b
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,8 +127,8 @@ static char *IsoLocaleName(const char *); /* MSVC specific */
static void icu_set_collation_attributes(UCollator *collator, const char *loc);
#endif
static char *get_collation_current_version(char collprovider,
const char *collcollate);
static char *get_collation_actual_version(char collprovider,
const char *collcollate);
/*
* pg_perm_setlocale
@ -1610,7 +1610,7 @@ pg_newlocale_from_collation(Oid collid)
* the operating system/library.
*/
static char *
get_collation_current_version(char collprovider, const char *collcollate)
get_collation_actual_version(char collprovider, const char *collcollate)
{
char *collversion = NULL;
@ -1717,8 +1717,8 @@ get_collation_version_for_oid(Oid oid, bool missing_ok)
if (!HeapTupleIsValid(tp))
elog(ERROR, "cache lookup failed for database %u", MyDatabaseId);
dbform = (Form_pg_database) GETSTRUCT(tp);
version = get_collation_current_version(COLLPROVIDER_LIBC,
NameStr(dbform->datcollate));
version = get_collation_actual_version(COLLPROVIDER_LIBC,
NameStr(dbform->datcollate));
}
else
{
@ -1732,8 +1732,8 @@ get_collation_version_for_oid(Oid oid, bool missing_ok)
elog(ERROR, "cache lookup failed for collation %u", oid);
}
collform = (Form_pg_collation) GETSTRUCT(tp);
version = get_collation_current_version(collform->collprovider,
NameStr(collform->collcollate));
version = get_collation_actual_version(collform->collprovider,
NameStr(collform->collcollate));
}
ReleaseSysCache(tp);