From 1259d83511a403adde8a7a28cd453dba78f4af1f Mon Sep 17 00:00:00 2001
From: Naisila Puka <37271756+naisila@users.noreply.github.com>
Date: Wed, 27 Jul 2022 14:33:31 +0300
Subject: [PATCH] Smallfix in CreateCollationDDL logic (#6089)

---
 src/backend/distributed/commands/collation.c                  | 2 +-
 src/test/regress/expected/distributed_collations_conflict.out | 4 ++--
 src/test/regress/sql/distributed_collations_conflict.sql      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backend/distributed/commands/collation.c b/src/backend/distributed/commands/collation.c
index 492e2ace2..834e847a1 100644
--- a/src/backend/distributed/commands/collation.c
+++ b/src/backend/distributed/commands/collation.c
@@ -106,7 +106,7 @@ CreateCollationDDLInternal(Oid collationId, Oid *collowner, char **quotedCollati
 					 "CREATE COLLATION %s (provider = '%s'",
 					 *quotedCollationName, providerString);
 
-	if (strcmp(collcollate, collctype))
+	if (strcmp(collcollate, collctype) == 0)
 	{
 		appendStringInfo(&collationNameDef,
 						 ", locale = %s",
diff --git a/src/test/regress/expected/distributed_collations_conflict.out b/src/test/regress/expected/distributed_collations_conflict.out
index 818de2697..8c6c741c5 100644
--- a/src/test/regress/expected/distributed_collations_conflict.out
+++ b/src/test/regress/expected/distributed_collations_conflict.out
@@ -74,13 +74,13 @@ ORDER BY 1,2,3;
 \c - - - :master_port
 SET search_path TO collation_conflict;
 -- 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
 ---------------------------------------------------------------------
  f
 (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
 ---------------------------------------------------------------------
  f
diff --git a/src/test/regress/sql/distributed_collations_conflict.sql b/src/test/regress/sql/distributed_collations_conflict.sql
index eceee4dd6..6c44449fe 100644
--- a/src/test/regress/sql/distributed_collations_conflict.sql
+++ b/src/test/regress/sql/distributed_collations_conflict.sql
@@ -67,8 +67,8 @@ ORDER BY 1,2,3;
 SET search_path TO collation_conflict;
 
 -- 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', 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', locale = 'und-u-ks-level2')$$);
 
 -- hide cascades
 SET client_min_messages TO error;