From 23291574067b55101b1423f1c711b604890f2825 Mon Sep 17 00:00:00 2001
From: Marco Slot <marco.slot@gmail.com>
Date: Sun, 24 Nov 2019 06:43:12 +0100
Subject: [PATCH] Swap aggregate_support tests to simplify enterprise merge

---
 .../regress/expected/aggregate_support.out    | 20 ++++++++++++-------
 src/test/regress/sql/aggregate_support.sql    |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/test/regress/expected/aggregate_support.out b/src/test/regress/expected/aggregate_support.out
index eddb3e0d2..e968169aa 100644
--- a/src/test/regress/expected/aggregate_support.out
+++ b/src/test/regress/expected/aggregate_support.out
@@ -166,19 +166,25 @@ select array_collect_sort(val) from aggdata;
 create user notsuper;
 NOTICE:  not propagating CREATE ROLE/USER commands to worker nodes
 HINT:  Connect to worker nodes directly to manually create all necessary users and roles.
-grant all on schema aggregate_support to notsuper;
-grant all on all tables in schema aggregate_support to notsuper;
-select run_command_on_workers($$
-create user notsuper;
-grant all on schema aggregate_support to notsuper;
-grant all on all tables in schema aggregate_support to notsuper;
-$$);
+select run_command_on_workers($$create user notsuper$$);
       run_command_on_workers       
 -----------------------------------
  (localhost,57637,t,"CREATE ROLE")
  (localhost,57638,t,"CREATE ROLE")
 (2 rows)
 
+grant all on schema aggregate_support to notsuper;
+grant all on all tables in schema aggregate_support to notsuper;
+select run_command_on_workers($$
+grant all on schema aggregate_support to notsuper;
+grant all on all tables in schema aggregate_support to notsuper;
+$$);
+  run_command_on_workers   
+---------------------------
+ (localhost,57637,t,GRANT)
+ (localhost,57638,t,GRANT)
+(2 rows)
+
 set role notsuper;
 select array_collect_sort(val) from aggdata;
          array_collect_sort          
diff --git a/src/test/regress/sql/aggregate_support.sql b/src/test/regress/sql/aggregate_support.sql
index 700dd53a1..f9710e13f 100644
--- a/src/test/regress/sql/aggregate_support.sql
+++ b/src/test/regress/sql/aggregate_support.sql
@@ -127,10 +127,10 @@ select array_collect_sort(val) from aggdata;
 
 -- Test multiuser scenario
 create user notsuper;
+select run_command_on_workers($$create user notsuper$$);
 grant all on schema aggregate_support to notsuper;
 grant all on all tables in schema aggregate_support to notsuper;
 select run_command_on_workers($$
-create user notsuper;
 grant all on schema aggregate_support to notsuper;
 grant all on all tables in schema aggregate_support to notsuper;
 $$);