summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavan Deolasee2017-07-26 05:13:24 +0000
committerPavan Deolasee2017-07-26 05:13:24 +0000
commit8fc6e2ffaa42a875507c5590d68e63146fc5890a (patch)
tree3560b60a42ed76394b176a2516bc937cfb6cab7c
parent9154cbac8e1c259db307f4c916975673bbc59f12 (diff)
Fix 'union' test case.
Since 93cbab90b0c6fc3fc4aa515b93057127c0ee8a1b we expect that the child table has columns at the same position as the parent table. So fix the test case to follow the rule and resolve expected output differences arising from that. The test case should pass with this change.
-rw-r--r--src/test/regress/expected/union.out4
-rw-r--r--src/test/regress/sql/union.sql4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/regress/expected/union.out b/src/test/regress/expected/union.out
index 05e13db310..e159c8b64b 100644
--- a/src/test/regress/expected/union.out
+++ b/src/test/regress/expected/union.out
@@ -538,10 +538,10 @@ explain (num_nodes off, nodes off, costs off)
-- Test that ORDER BY for UNION ALL can be pushed down to inheritance
-- children.
--
-CREATE TEMP TABLE t1c (b text, a text);
+CREATE TEMP TABLE t1c (a text, b text);
ALTER TABLE t1c INHERIT t1;
CREATE TEMP TABLE t2c (primary key (ab)) INHERITS (t2);
-INSERT INTO t1c VALUES ('v', 'w'), ('c', 'd'), ('m', 'n'), ('e', 'f');
+INSERT INTO t1c (b, a) VALUES ('v', 'w'), ('c', 'd'), ('m', 'n'), ('e', 'f');
INSERT INTO t2c VALUES ('vw'), ('cd'), ('mn'), ('ef');
CREATE INDEX t1c_ab_idx on t1c ((a || b));
set enable_seqscan = on;
diff --git a/src/test/regress/sql/union.sql b/src/test/regress/sql/union.sql
index f0f7640869..d71375b897 100644
--- a/src/test/regress/sql/union.sql
+++ b/src/test/regress/sql/union.sql
@@ -212,10 +212,10 @@ explain (num_nodes off, nodes off, costs off)
-- children.
--
-CREATE TEMP TABLE t1c (b text, a text);
+CREATE TEMP TABLE t1c (a text, b text);
ALTER TABLE t1c INHERIT t1;
CREATE TEMP TABLE t2c (primary key (ab)) INHERITS (t2);
-INSERT INTO t1c VALUES ('v', 'w'), ('c', 'd'), ('m', 'n'), ('e', 'f');
+INSERT INTO t1c (b, a) VALUES ('v', 'w'), ('c', 'd'), ('m', 'n'), ('e', 'f');
INSERT INTO t2c VALUES ('vw'), ('cd'), ('mn'), ('ef');
CREATE INDEX t1c_ab_idx on t1c ((a || b));