summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPallavi Sontakke2016-01-27 13:45:24 +0000
committerPavan Deolasee2016-10-18 09:47:52 +0000
commit4006c238cc84815b5e3bf8605b3b6f24872129e0 (patch)
tree8f8f6ef5465154e2b7d6decc716dac344f9ff28b
parent762cfa11cbd0fff8adb6b56872e6e65260f88d40 (diff)
Test output changes
Fix 2 tests.
-rw-r--r--src/test/regress/expected/foreign_data_1.out8
-rw-r--r--src/test/regress/expected/rangefuncs.out3
-rw-r--r--src/test/regress/input/xc_copy.source4
3 files changed, 8 insertions, 7 deletions
diff --git a/src/test/regress/expected/foreign_data_1.out b/src/test/regress/expected/foreign_data_1.out
index 541b058c96..5575f590c8 100644
--- a/src/test/regress/expected/foreign_data_1.out
+++ b/src/test/regress/expected/foreign_data_1.out
@@ -1411,15 +1411,15 @@ DROP FOREIGN TABLE IF EXISTS no_table;
NOTICE: foreign table "no_table" does not exist, skipping
DROP FOREIGN TABLE foreign_schema.foreign_table_1;
ERROR: foreign table "foreign_table_1" does not exist
+-- REASSIGN OWNED/DROP OWNED of foreign objects
+REASSIGN OWNED BY regress_test_role TO regress_test_role2;
+DROP OWNED BY regress_test_role2;
+DROP OWNED BY regress_test_role2 CASCADE;
-- Cleanup
DROP SCHEMA foreign_schema CASCADE;
DROP ROLE regress_test_role; -- ERROR
-DROP SERVER s5 CASCADE;
-ERROR: server "s5" does not exist
DROP SERVER t1 CASCADE;
ERROR: server "t1" does not exist
-DROP SERVER t2;
-ERROR: server "t2" does not exist
DROP USER MAPPING FOR regress_test_role SERVER s6;
ERROR: role "regress_test_role" does not exist
-- This test causes some order dependent cascade detail output,
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
index 3fc3ab7507..c461b51006 100644
--- a/src/test/regress/expected/rangefuncs.out
+++ b/src/test/regress/expected/rangefuncs.out
@@ -3,6 +3,7 @@ SELECT name, setting FROM pg_settings WHERE name LIKE 'enable%' ORDER BY name;
------------------------------+---------
enable_bitmapscan | on
enable_datanode_row_triggers | off
+ enable_fast_query_shipping | on
enable_hashagg | on
enable_hashjoin | on
enable_indexonlyscan | on
@@ -13,7 +14,7 @@ SELECT name, setting FROM pg_settings WHERE name LIKE 'enable%' ORDER BY name;
enable_seqscan | on
enable_sort | on
enable_tidscan | on
-(12 rows)
+(13 rows)
CREATE TABLE foo2(fooid int, f2 int);
INSERT INTO foo2 VALUES(1, 11);
diff --git a/src/test/regress/input/xc_copy.source b/src/test/regress/input/xc_copy.source
index cf08efe74d..5079ce8176 100644
--- a/src/test/regress/input/xc_copy.source
+++ b/src/test/regress/input/xc_copy.source
@@ -2,7 +2,7 @@
-- XC_COPY
--
--- COPY tests for a Postgres-XC cluster
+-- COPY tests for a Postgres-XL cluster
create or replace function pgxc_nodetype() returns varchar as
$$
@@ -92,7 +92,7 @@ drop function deffunc_str();
drop function deffunc_str_i();
drop function deffunc_nullstring();
--- Tests related to COPY for a Postgres-XC cluster
+-- Tests related to COPY for a Postgres-XL cluster
-- Create a table not using the first node of cluster
SELECT create_table_nodes('xc_copy_1(a int, b int)', '{2}'::int[], 'replication', NULL);
INSERT INTO xc_copy_1 VALUES (1,23),(34,5),(9,11);