From 7e9dd1fa62ab9b3d6c7dd10372d1ba200207d14f Mon Sep 17 00:00:00 2001
From: Haozhou Wang <hawang@pivotal.io>
Date: Tue, 21 Feb 2017 07:13:53 +0000
Subject: [PATCH] Fix contrib extprotocol test

Due to changes of external table "on master" feature
---
 contrib/extprotocol/expected/exttableext.out | 8 ++++++--
 contrib/extprotocol/sql/exttableext.sql      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/contrib/extprotocol/expected/exttableext.out b/contrib/extprotocol/expected/exttableext.out
index 9008ca9156..b3f20669a4 100644
--- a/contrib/extprotocol/expected/exttableext.out
+++ b/contrib/extprotocol/expected/exttableext.out
@@ -13,10 +13,10 @@ NOTICE:  table "exttabtest_r" does not exist, skipping
         LOCATION('demoprot://exttabtest.txt') 
     FORMAT 'text';
     -- Checking pg_exttable for new created RET and WET
-    select location,fmttype,fmtopts,encoding,writable from pg_exttable 
+    select urilocation,fmttype,fmtopts,encoding,writable from pg_exttable 
     where reloid='exttabtest_r'::regclass 
        or reloid='exttabtest_w'::regclass;
-          location           | fmttype |                fmtopts                 | encoding | writable 
+         urilocation         | fmttype |                fmtopts                 | encoding | writable
 -----------------------------+---------+----------------------------------------+----------+----------
  {demoprot://exttabtest.txt} | t       | delimiter '     ' null '\N' escape '\' |        6 | t
  {demoprot://exttabtest.txt} | t       | delimiter '     ' null '\N' escape '\' |        6 | f
@@ -674,6 +674,7 @@ Encoding: UTF8
 Format type: text
 Format options: delimiter '	' null '\N' escape '\'
 External location: demoprot://exttabtest.txt
+Execute on: all segments
 External options: {}
 
     select count(*) from pg_class where relname = 'exttabtest_r_newname';
@@ -847,6 +848,7 @@ Format type: custom
 Format options: formatter 'formatter_export_s' 
 External options: {}
 External location: demoprot://exttabtest_test63
+Execute on: all segments
 
     \d format_r
    External table "exttableext.format_r"
@@ -862,6 +864,7 @@ Format type: custom
 Format options: formatter 'formatter_import_s' 
 External options: {}
 External location: demoprot://exttabtest_test63
+Execute on: all segments
 
     -- Checking pg_exttable 
     select pg_class.relname, fmttype,
@@ -1593,6 +1596,7 @@ Format type: text
 Format options: delimiter '	' null '\N' escape '\'
 External options: {}
 External location: demoprot://exttabtest.txt
+Execute on: all segments
 
     -- Create a new ext table using the new protocol name
     DROP EXTERNAL TABLE IF EXISTS exttabtest_w_new;
diff --git a/contrib/extprotocol/sql/exttableext.sql b/contrib/extprotocol/sql/exttableext.sql
index f707eae4cc..427b84cbc2 100644
--- a/contrib/extprotocol/sql/exttableext.sql
+++ b/contrib/extprotocol/sql/exttableext.sql
@@ -14,7 +14,7 @@ SET search_path TO 'exttableext';
     FORMAT 'text';
 
     -- Checking pg_exttable for new created RET and WET
-    select location,fmttype,fmtopts,encoding,writable from pg_exttable 
+    select urilocation,fmttype,fmtopts,encoding,writable from pg_exttable 
     where reloid='exttabtest_r'::regclass 
        or reloid='exttabtest_w'::regclass;
 
-- 
GitLab