diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2021-02-26 15:29:27 +1300 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2021-02-26 15:29:27 +1300 |
| commit | 8556267b2b1b8e1c26037c4c25cf390ee5afb5d9 (patch) | |
| tree | c6db2301e5a3a8339ce3ccb1530711fc6fa42aae /src/backend/utils/adt/pg_locale.c | |
| parent | 80ca8464fe02296c8efefd53746e6d6a3f456d1e (diff) | |
Revert "pg_collation_actual_version() -> pg_collation_current_version()."
This reverts commit 9cf184cc0599b6e65e7e5ecd9d91cd42e278bcd8. Name
change less well received than anticipated.
Discussion: https://postgr.es/m/afcfb97e-88a1-a540-db95-6c573b93bc2b%40eisentraut.org
Diffstat (limited to 'src/backend/utils/adt/pg_locale.c')
| -rw-r--r-- | src/backend/utils/adt/pg_locale.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index df1f36132d3..aa4874163f8 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -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); |