From 262a18302373fd4ee2e371024ecc423fb97976f7 Mon Sep 17 00:00:00 2001
From: Jason Petersen <jason@citusdata.com>
Date: Sun, 4 Jun 2017 23:08:12 -0600
Subject: [PATCH] Fix psql-dependent mx-metadata test

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

diff --git a/src/test/regress/expected/multi_mx_metadata.out b/src/test/regress/expected/multi_mx_metadata.out
index 5798cb557..5b990d03e 100644
--- a/src/test/regress/expected/multi_mx_metadata.out
+++ b/src/test/regress/expected/multi_mx_metadata.out
@@ -43,15 +43,26 @@ SELECT count(*) FROM pg_dist_transaction;
 (1 row)
 
 \c - - - :worker_1_port
-\d distributed_mx_table
-Table "public.distributed_mx_table"
+SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='distributed_mx_table'::regclass;
  Column | Type  | Modifiers 
 --------+-------+-----------
  key    | text  | not null
  value  | jsonb | 
-Indexes:
-    "distributed_mx_table_pkey" PRIMARY KEY, btree (key)
-    "distributed_mx_table_value_idx" gin (value)
+(2 rows)
+
+\d distributed_mx_table_pkey
+Index "public.distributed_mx_table_pkey"
+ Column | Type | Definition 
+--------+------+------------
+ key    | text | key
+primary key, btree, for table "public.distributed_mx_table"
+
+\d distributed_mx_table_value_idx
+Index "public.distributed_mx_table_value_idx"
+ Column | Type | Definition 
+--------+------+------------
+ value  | text | value
+gin, for table "public.distributed_mx_table"
 
 SELECT repmodel FROM pg_dist_partition
 WHERE logicalrelid = 'distributed_mx_table'::regclass;
@@ -68,15 +79,26 @@ WHERE logicalrelid = 'distributed_mx_table'::regclass;
 (1 row)
 
 \c - - - :worker_2_port
-\d distributed_mx_table
-Table "public.distributed_mx_table"
+SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='distributed_mx_table'::regclass;
  Column | Type  | Modifiers 
 --------+-------+-----------
  key    | text  | not null
  value  | jsonb | 
-Indexes:
-    "distributed_mx_table_pkey" PRIMARY KEY, btree (key)
-    "distributed_mx_table_value_idx" gin (value)
+(2 rows)
+
+\d distributed_mx_table_pkey
+Index "public.distributed_mx_table_pkey"
+ Column | Type | Definition 
+--------+------+------------
+ key    | text | key
+primary key, btree, for table "public.distributed_mx_table"
+
+\d distributed_mx_table_value_idx
+Index "public.distributed_mx_table_value_idx"
+ Column | Type | Definition 
+--------+------+------------
+ value  | text | value
+gin, for table "public.distributed_mx_table"
 
 SELECT repmodel FROM pg_dist_partition
 WHERE logicalrelid = 'distributed_mx_table'::regclass;
diff --git a/src/test/regress/sql/multi_mx_metadata.sql b/src/test/regress/sql/multi_mx_metadata.sql
index f86834beb..d804d4307 100644
--- a/src/test/regress/sql/multi_mx_metadata.sql
+++ b/src/test/regress/sql/multi_mx_metadata.sql
@@ -27,7 +27,9 @@ SELECT count(*) FROM pg_dist_transaction;
 
 \c - - - :worker_1_port
 
-\d distributed_mx_table
+SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='distributed_mx_table'::regclass;
+\d distributed_mx_table_pkey
+\d distributed_mx_table_value_idx
 
 SELECT repmodel FROM pg_dist_partition
 WHERE logicalrelid = 'distributed_mx_table'::regclass;
@@ -37,7 +39,9 @@ WHERE logicalrelid = 'distributed_mx_table'::regclass;
 
 \c - - - :worker_2_port
 
-\d distributed_mx_table
+SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='distributed_mx_table'::regclass;
+\d distributed_mx_table_pkey
+\d distributed_mx_table_value_idx
 
 SELECT repmodel FROM pg_dist_partition
 WHERE logicalrelid = 'distributed_mx_table'::regclass;