From: Tomas Vondra <tomas@2ndquadrant.com>
Date: Sun, 22 Jan 2017 16:52:18 +0000 (+0100)
Subject: fix regression test breakage due to minor changes in output
X-Git-Tag: XL_10_R1BETA1~415
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=e7860395f85d897e307d6a0d2eb48f0fc7466d7b;p=postgres-xl.git

fix regression test breakage due to minor changes in output

Typically change in error message wording, description output etc.
---

diff --git a/src/test/regress/expected/insert.out b/src/test/regress/expected/insert.out
index db59e887be..9af76a871d 100644
--- a/src/test/regress/expected/insert.out
+++ b/src/test/regress/expected/insert.out
@@ -156,6 +156,8 @@ Rules:
     irule3 AS
     ON INSERT TO inserttest2 DO  INSERT INTO inserttest (f4[1].if1, f4[1].if2[2])  SELECT new.f1,
             new.f2
+Distribute By: HASH(f1)
+Location Nodes: ALL DATANODES
 
 drop table inserttest2;
 drop table inserttest;
diff --git a/src/test/regress/expected/replica_identity.out b/src/test/regress/expected/replica_identity.out
index 1b539c3b57..d230f9d57e 100644
--- a/src/test/regress/expected/replica_identity.out
+++ b/src/test/regress/expected/replica_identity.out
@@ -178,9 +178,9 @@ Indexes:
     "test_replica_identity_hash" hash (nonkey)
     "test_replica_identity_keyab" btree (keya, keyb)
 Replica Identity: FULL
+Has OIDs: yes
 Distribute By: REPLICATION
 Location Nodes: ALL DATANODES
-Has OIDs: yes
 
 ALTER TABLE test_replica_identity REPLICA IDENTITY NOTHING;
 SELECT relreplident FROM pg_class WHERE oid = 'test_replica_identity'::regclass;
diff --git a/src/test/regress/expected/select_into.out b/src/test/regress/expected/select_into.out
index c11bb58b63..8662413656 100644
--- a/src/test/regress/expected/select_into.out
+++ b/src/test/regress/expected/select_into.out
@@ -54,9 +54,9 @@ DROP USER regress_selinto_user;
 CREATE TABLE ctas_base (i int, j int);
 INSERT INTO ctas_base VALUES (1, 2);
 CREATE TABLE ctas_nodata (ii, jj, kk) AS SELECT i, j FROM ctas_base; -- Error
-ERROR:  too many column names were specified
+ERROR:  CREATE TABLE AS specifies too many column names
 CREATE TABLE ctas_nodata (ii, jj, kk) AS SELECT i, j FROM ctas_base WITH NO DATA; -- Error
-ERROR:  too many column names were specified
+ERROR:  CREATE TABLE AS specifies too many column names
 CREATE TABLE ctas_nodata (ii, jj) AS SELECT i, j FROM ctas_base; -- OK
 CREATE TABLE ctas_nodata_2 (ii, jj) AS SELECT i, j FROM ctas_base WITH NO DATA; -- OK
 CREATE TABLE ctas_nodata_3 (ii) AS SELECT i, j FROM ctas_base; -- OK
diff --git a/src/test/regress/expected/updatable_views.out b/src/test/regress/expected/updatable_views.out
index 74f5c8a909..fd70e9050d 100644
--- a/src/test/regress/expected/updatable_views.out
+++ b/src/test/regress/expected/updatable_views.out
@@ -1699,7 +1699,7 @@ ERROR:  Postgres-XL does not support TRIGGER yet
 DETAIL:  The feature is not currently supported
 CREATE VIEW rw_view1 AS SELECT * FROM base_tbl WHERE a < b WITH CHECK OPTION;
 INSERT INTO rw_view1 VALUES (5,0); -- ok
-ERROR:  new row violates WITH CHECK OPTION for "rw_view1"
+ERROR:  new row violates check option for view "rw_view1"
 DETAIL:  Failing row contains (5, 0).
 INSERT INTO rw_view1 VALUES (15, 20); -- should fail
 UPDATE rw_view1 SET a = 20, b = 30; -- should fail
@@ -1734,7 +1734,7 @@ DETAIL:  The feature is not currently supported
 CREATE VIEW rw_view2 AS
   SELECT * FROM rw_view1 WHERE a > 0 WITH LOCAL CHECK OPTION;
 INSERT INTO rw_view2 VALUES (-5); -- should fail
-ERROR:  new row violates WITH CHECK OPTION for "rw_view2"
+ERROR:  new row violates check option for view "rw_view2"
 DETAIL:  Failing row contains (-5, null).
 INSERT INTO rw_view2 VALUES (5); -- ok
 INSERT INTO rw_view2 VALUES (50); -- ok, but not in view
@@ -1749,7 +1749,7 @@ SELECT * FROM base_tbl;
 -- Check option won't cascade down to base view with INSTEAD OF triggers
 ALTER VIEW rw_view2 SET (check_option=cascaded);
 INSERT INTO rw_view2 VALUES (100); -- ok, but not in view (doesn't fail rw_view1's check)
-ERROR:  new row violates WITH CHECK OPTION for "rw_view1"
+ERROR:  new row violates check option for view "rw_view1"
 DETAIL:  Failing row contains (100, null).
 UPDATE rw_view2 SET a = 200 WHERE a = 5; -- ok, but not in view (doesn't fail rw_view1's check)
 SELECT * FROM base_tbl;