From eddfea18c28811ac4774d1a4cd4e47f7e381bf0b Mon Sep 17 00:00:00 2001
From: Ahmet Gedemenli <afgedemenli@gmail.com>
Date: Wed, 16 Mar 2022 15:49:28 +0300
Subject: [PATCH] Fix role creation issue on schema tests (#5812)

---
 .../regress/expected/multi_mx_schema_support.out     | 12 ++++++------
 src/test/regress/sql/multi_mx_schema_support.sql     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/regress/expected/multi_mx_schema_support.out b/src/test/regress/expected/multi_mx_schema_support.out
index b278b6506..2037a670f 100644
--- a/src/test/regress/expected/multi_mx_schema_support.out
+++ b/src/test/regress/expected/multi_mx_schema_support.out
@@ -541,11 +541,11 @@ SELECT run_command_on_workers($$DROP SCHEMA localschema;$$);
 SET client_min_messages TO ERROR;
 CREATE ROLE schema_owner WITH LOGIN;
 RESET client_min_messages;
-SELECT run_command_on_workers($$CREATE ROLE schema_owner WITH LOGIN;$$);
+SELECT run_command_on_workers($$SET citus.enable_ddl_propagation TO OFF;CREATE ROLE schema_owner WITH LOGIN;RESET citus.enable_ddl_propagation;$$);
       run_command_on_workers
 ---------------------------------------------------------------------
- (localhost,57637,t,"CREATE ROLE")
- (localhost,57638,t,"CREATE ROLE")
+ (localhost,57637,t,SET)
+ (localhost,57638,t,SET)
 (2 rows)
 
 RESET citus.enable_ddl_propagation;
@@ -566,11 +566,11 @@ SET citus.enable_ddl_propagation TO OFF;
 SET client_min_messages TO ERROR;
 CREATE ROLE role_to_be_granted WITH LOGIN;
 RESET client_min_messages;
-SELECT run_command_on_workers($$CREATE ROLE role_to_be_granted WITH LOGIN;$$);
+SELECT run_command_on_workers($$SET citus.enable_ddl_propagation TO OFF;CREATE ROLE role_to_be_granted WITH LOGIN;RESET citus.enable_ddl_propagation;$$);
       run_command_on_workers
 ---------------------------------------------------------------------
- (localhost,57637,t,"CREATE ROLE")
- (localhost,57638,t,"CREATE ROLE")
+ (localhost,57637,t,SET)
+ (localhost,57638,t,SET)
 (2 rows)
 
 RESET citus.enable_ddl_propagation;
diff --git a/src/test/regress/sql/multi_mx_schema_support.sql b/src/test/regress/sql/multi_mx_schema_support.sql
index bf84f0469..e2eceb0b3 100644
--- a/src/test/regress/sql/multi_mx_schema_support.sql
+++ b/src/test/regress/sql/multi_mx_schema_support.sql
@@ -354,7 +354,7 @@ SELECT run_command_on_workers($$DROP SCHEMA localschema;$$);
 SET client_min_messages TO ERROR;
 CREATE ROLE schema_owner WITH LOGIN;
 RESET client_min_messages;
-SELECT run_command_on_workers($$CREATE ROLE schema_owner WITH LOGIN;$$);
+SELECT run_command_on_workers($$SET citus.enable_ddl_propagation TO OFF;CREATE ROLE schema_owner WITH LOGIN;RESET citus.enable_ddl_propagation;$$);
 RESET citus.enable_ddl_propagation;
 -- create schema with the name of the owner
 CREATE SCHEMA AUTHORIZATION schema_owner;
@@ -369,7 +369,7 @@ SET citus.enable_ddl_propagation TO OFF;
 SET client_min_messages TO ERROR;
 CREATE ROLE role_to_be_granted WITH LOGIN;
 RESET client_min_messages;
-SELECT run_command_on_workers($$CREATE ROLE role_to_be_granted WITH LOGIN;$$);
+SELECT run_command_on_workers($$SET citus.enable_ddl_propagation TO OFF;CREATE ROLE role_to_be_granted WITH LOGIN;RESET citus.enable_ddl_propagation;$$);
 RESET citus.enable_ddl_propagation;
 
 CREATE SCHEMA old_schema;