From a797584f1c2b53cf5d2254a3d446ad4bfd0286bd Mon Sep 17 00:00:00 2001
From: gindibay <gindibay@microsoft.com>
Date: Fri, 27 Oct 2023 09:07:19 +0300
Subject: [PATCH] Fixes tests

---
 src/backend/distributed/commands/database.c   | 38 ++++++++++++-------
 .../create_drop_database_propagation.out      |  6 +--
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/backend/distributed/commands/database.c b/src/backend/distributed/commands/database.c
index e7a8299ae..4e9528ffe 100644
--- a/src/backend/distributed/commands/database.c
+++ b/src/backend/distributed/commands/database.c
@@ -545,20 +545,29 @@ FreeDatabaseCollationInfo(DatabaseCollationInfo collInfo)
 }
 
 
-
-static char *get_locale_provider_string(char datlocprovider)
+static char *
+get_locale_provider_string(char datlocprovider)
 {
-    switch (datlocprovider)
-    {
-        case 'c':
-            return "libc";
-        case 'i':
-            return "icu";
-        case 'l':
-            return "locale";
-        default:
-            return "";
-    }
+	switch (datlocprovider)
+	{
+		case 'c':
+		{
+			return "libc";
+		}
+
+		case 'i':
+		{
+			return "icu";
+		}
+
+		case 'l':
+		{
+			return "locale";
+		}
+
+		default:
+			return "";
+	}
 }
 
 
@@ -605,7 +614,8 @@ GenerateCreateDatabaseStatementFromPgDatabase(Form_pg_database databaseForm)
 
 	if (databaseForm->datlocprovider != 0)
 	{
-		appendStringInfo(&str, " LOCALE_PROVIDER = '%s'", get_locale_provider_string(databaseForm->datlocprovider));
+		appendStringInfo(&str, " LOCALE_PROVIDER = '%s'", get_locale_provider_string(
+							 databaseForm->datlocprovider));
 	}
 
 	if (collInfo.collversion != NULL)
diff --git a/src/test/regress/expected/create_drop_database_propagation.out b/src/test/regress/expected/create_drop_database_propagation.out
index 78ce0025e..e05616a42 100644
--- a/src/test/regress/expected/create_drop_database_propagation.out
+++ b/src/test/regress/expected/create_drop_database_propagation.out
@@ -10,10 +10,10 @@ CREATE TABLESPACE create_drop_db_tablespace LOCATION :'create_drop_db_tablespace
 create user create_drop_db_test_user;
 set citus.enable_create_database_propagation=on;
 CREATE DATABASE mydatabase
-    WITH TEMPLATE = 'template0'
-            OWNER = create_drop_db_test_user
-            CONNECTION LIMIT = 10
+    WITH OWNER = create_drop_db_test_user
+    TEMPLATE = 'template0'
             ENCODING = 'UTF8'
+            CONNECTION LIMIT = 10
             LC_COLLATE = 'C'
             LC_CTYPE = 'C'
             TABLESPACE = create_drop_db_tablespace