@@ -66,7 +66,7 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
66
66
DefElem * versionEl = NULL ;
67
67
char * collcollate ;
68
68
char * collctype ;
69
- char * colliculocale ;
69
+ char * colllocale ;
70
70
char * collicurules ;
71
71
bool collisdeterministic ;
72
72
int collencoding ;
@@ -157,11 +157,11 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
157
157
else
158
158
collctype = NULL ;
159
159
160
- datum = SysCacheGetAttr (COLLOID , tp , Anum_pg_collation_colliculocale , & isnull );
160
+ datum = SysCacheGetAttr (COLLOID , tp , Anum_pg_collation_colllocale , & isnull );
161
161
if (!isnull )
162
- colliculocale = TextDatumGetCString (datum );
162
+ colllocale = TextDatumGetCString (datum );
163
163
else
164
- colliculocale = NULL ;
164
+ colllocale = NULL ;
165
165
166
166
/*
167
167
* When the ICU locale comes from an existing collation, do not
@@ -194,7 +194,7 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
194
194
195
195
collcollate = NULL ;
196
196
collctype = NULL ;
197
- colliculocale = NULL ;
197
+ colllocale = NULL ;
198
198
collicurules = NULL ;
199
199
200
200
if (providerEl )
@@ -234,7 +234,7 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
234
234
collctype = defGetString (localeEl );
235
235
}
236
236
else
237
- colliculocale = defGetString (localeEl );
237
+ colllocale = defGetString (localeEl );
238
238
}
239
239
240
240
if (lccollateEl )
@@ -259,7 +259,7 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
259
259
}
260
260
else if (collprovider == COLLPROVIDER_ICU )
261
261
{
262
- if (!colliculocale )
262
+ if (!colllocale )
263
263
ereport (ERROR ,
264
264
(errcode (ERRCODE_INVALID_OBJECT_DEFINITION ),
265
265
errmsg ("parameter \"%s\" must be specified" ,
@@ -271,20 +271,20 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
271
271
*/
272
272
if (!IsBinaryUpgrade )
273
273
{
274
- char * langtag = icu_language_tag (colliculocale ,
274
+ char * langtag = icu_language_tag (colllocale ,
275
275
icu_validation_level );
276
276
277
- if (langtag && strcmp (colliculocale , langtag ) != 0 )
277
+ if (langtag && strcmp (colllocale , langtag ) != 0 )
278
278
{
279
279
ereport (NOTICE ,
280
280
(errmsg ("using standard form \"%s\" for ICU locale \"%s\"" ,
281
- langtag , colliculocale )));
281
+ langtag , colllocale )));
282
282
283
- colliculocale = langtag ;
283
+ colllocale = langtag ;
284
284
}
285
285
}
286
286
287
- icu_validate_locale (colliculocale );
287
+ icu_validate_locale (colllocale );
288
288
}
289
289
290
290
/*
@@ -332,7 +332,7 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
332
332
}
333
333
334
334
if (!collversion )
335
- collversion = get_collation_actual_version (collprovider , collprovider == COLLPROVIDER_ICU ? colliculocale : collcollate );
335
+ collversion = get_collation_actual_version (collprovider , collprovider == COLLPROVIDER_ICU ? colllocale : collcollate );
336
336
337
337
newoid = CollationCreate (collName ,
338
338
collNamespace ,
@@ -342,7 +342,7 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
342
342
collencoding ,
343
343
collcollate ,
344
344
collctype ,
345
- colliculocale ,
345
+ colllocale ,
346
346
collicurules ,
347
347
collversion ,
348
348
if_not_exists ,
@@ -433,7 +433,7 @@ AlterCollation(AlterCollationStmt *stmt)
433
433
datum = SysCacheGetAttr (COLLOID , tup , Anum_pg_collation_collversion , & isnull );
434
434
oldversion = isnull ? NULL : TextDatumGetCString (datum );
435
435
436
- datum = SysCacheGetAttrNotNull (COLLOID , tup , collForm -> collprovider == COLLPROVIDER_ICU ? Anum_pg_collation_colliculocale : Anum_pg_collation_collcollate );
436
+ datum = SysCacheGetAttrNotNull (COLLOID , tup , collForm -> collprovider == COLLPROVIDER_ICU ? Anum_pg_collation_colllocale : Anum_pg_collation_collcollate );
437
437
newversion = get_collation_actual_version (collForm -> collprovider , TextDatumGetCString (datum ));
438
438
439
439
/* cannot change from NULL to non-NULL or vice versa */
@@ -500,7 +500,7 @@ pg_collation_actual_version(PG_FUNCTION_ARGS)
500
500
501
501
datum = SysCacheGetAttrNotNull (DATABASEOID , dbtup ,
502
502
provider == COLLPROVIDER_ICU ?
503
- Anum_pg_database_daticulocale : Anum_pg_database_datcollate );
503
+ Anum_pg_database_datlocale : Anum_pg_database_datcollate );
504
504
505
505
locale = TextDatumGetCString (datum );
506
506
@@ -521,7 +521,7 @@ pg_collation_actual_version(PG_FUNCTION_ARGS)
521
521
Assert (provider != COLLPROVIDER_DEFAULT );
522
522
datum = SysCacheGetAttrNotNull (COLLOID , colltp ,
523
523
provider == COLLPROVIDER_ICU ?
524
- Anum_pg_collation_colliculocale : Anum_pg_collation_collcollate );
524
+ Anum_pg_collation_colllocale : Anum_pg_collation_collcollate );
525
525
526
526
locale = TextDatumGetCString (datum );
527
527
0 commit comments