external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PG15: Handle data type changes in pg_collation. 

Account for PG commit 54637508f8.
pull/5920/head
Jeff Davis 2022-04-09 11:01:10 -07:00 committed by jeff-davis
parent 9915fe8a1a
commit 70c915a0f2
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/distributed/commands/collation.c
View File

@ -60,12 +60,30 @@ CreateCollationDDLInternal(Oid collationId, Oid *collowner, char **quotedCollati
Form_pg_collation collationForm = (Form_pg_collation) GETSTRUCT(heapTuple); Form_pg_collation collationForm = (Form_pg_collation) GETSTRUCT(heapTuple);
char collprovider = collationForm->collprovider; char collprovider = collationForm->collprovider;
const char *collcollate = NameStr(collationForm->collcollate);
const char *collctype = NameStr(collationForm->collctype);
Oid collnamespace = collationForm->collnamespace; Oid collnamespace = collationForm->collnamespace;
const char *collname = NameStr(collationForm->collname); const char *collname = NameStr(collationForm->collname);
bool collisdeterministic = collationForm->collisdeterministic; bool collisdeterministic = collationForm->collisdeterministic;
#if PG_VERSION_NUM >= PG_VERSION_15
bool isnull;
Datum datum = SysCacheGetAttr(COLLOID, heapTuple, Anum_pg_collation_collcollate,
&isnull);
Assert(!isnull);
char *collcollate = TextDatumGetCString(datum);
datum = SysCacheGetAttr(COLLOID, heapTuple, Anum_pg_collation_collctype, &isnull);
Assert(!isnull);
char *collctype = TextDatumGetCString(datum);
#else
/*
* In versions before 15, collcollate and collctype were type "name". Use
* pstrdup() to match the interface of 15 so that we consistently free the
* result later.
*/
char *collcollate = pstrdup(NameStr(collationForm->collcollate));
char *collctype = pstrdup(NameStr(collationForm->collctype));
#endif
if (collowner != NULL) if (collowner != NULL)
{ {
*collowner = collationForm->collowner; *collowner = collationForm->collowner;
@ -103,6 +121,9 @@ CreateCollationDDLInternal(Oid collationId, Oid *collowner, char **quotedCollati
quote_literal_cstr(collctype)); quote_literal_cstr(collctype));
} }
pfree(collcollate);
pfree(collctype);
if (!collisdeterministic) if (!collisdeterministic)
{ {
appendStringInfoString(&collationNameDef, ", deterministic = false"); appendStringInfoString(&collationNameDef, ", deterministic = false");