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

Smallfix in CreateCollationDDL logic (#6089)

pull/6056/head
Naisila Puka 2022-07-27 14:33:31 +03:00 committed by GitHub
parent 14c56ce0dd
commit 1259d83511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@ CreateCollationDDLInternal(Oid collationId, Oid *collowner, char **quotedCollati
"CREATE COLLATION %s (provider = '%s'", "CREATE COLLATION %s (provider = '%s'",
*quotedCollationName, providerString); *quotedCollationName, providerString);
if (strcmp(collcollate, collctype)) if (strcmp(collcollate, collctype) == 0)
{ {
appendStringInfo(&collationNameDef, appendStringInfo(&collationNameDef,
", locale = %s", ", locale = %s",

4
src/test/regress/expected/distributed_collations_conflict.out
View File

@ -74,13 +74,13 @@ ORDER BY 1,2,3;
\c - - - :master_port \c - - - :master_port
SET search_path TO collation_conflict; SET search_path TO collation_conflict;
-- now test worker_create_or_replace_object directly -- now test worker_create_or_replace_object directly
SELECT worker_create_or_replace_object($$CREATE COLLATION collation_conflict.caseinsensitive (provider = 'icu', lc_collate = 'und-u-ks-level2', lc_ctype = 'und-u-ks-level2')$$); SELECT worker_create_or_replace_object($$CREATE COLLATION collation_conflict.caseinsensitive (provider = 'icu', locale = 'und-u-ks-level2')$$);
worker_create_or_replace_object worker_create_or_replace_object
--------------------------------------------------------------------- ---------------------------------------------------------------------
f f
(1 row) (1 row)
SELECT worker_create_or_replace_object($$CREATE COLLATION collation_conflict.caseinsensitive (provider = 'icu', lc_collate = 'und-u-ks-level2', lc_ctype = 'und-u-ks-level2')$$); SELECT worker_create_or_replace_object($$CREATE COLLATION collation_conflict.caseinsensitive (provider = 'icu', locale = 'und-u-ks-level2')$$);
worker_create_or_replace_object worker_create_or_replace_object
--------------------------------------------------------------------- ---------------------------------------------------------------------
f f

4
src/test/regress/sql/distributed_collations_conflict.sql
View File

@ -67,8 +67,8 @@ ORDER BY 1,2,3;
SET search_path TO collation_conflict; SET search_path TO collation_conflict;
-- now test worker_create_or_replace_object directly -- now test worker_create_or_replace_object directly
SELECT worker_create_or_replace_object($$CREATE COLLATION collation_conflict.caseinsensitive (provider = 'icu', lc_collate = 'und-u-ks-level2', lc_ctype = 'und-u-ks-level2')$$); SELECT worker_create_or_replace_object($$CREATE COLLATION collation_conflict.caseinsensitive (provider = 'icu', locale = 'und-u-ks-level2')$$);
SELECT worker_create_or_replace_object($$CREATE COLLATION collation_conflict.caseinsensitive (provider = 'icu', lc_collate = 'und-u-ks-level2', lc_ctype = 'und-u-ks-level2')$$); SELECT worker_create_or_replace_object($$CREATE COLLATION collation_conflict.caseinsensitive (provider = 'icu', locale = 'und-u-ks-level2')$$);
-- hide cascades -- hide cascades
SET client_min_messages TO error; SET client_min_messages TO error;