From d2ccc707af4d0eb45b907383f6b274060d1f6e16 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 13 Aug 2006 17:58:49 +0000 Subject: [PATCH] Original coding of 'returning' regression test inadvertently chose a nonunique join value, leading to plan-choice-dependent results ... and it seems some platforms will choose a different plan. Tweak the test so that it has well-defined results. Per report from Olivier Prenant. --- src/test/regress/expected/returning.out | 16 ++++++++-------- src/test/regress/sql/returning.sql | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/regress/expected/returning.out b/src/test/regress/expected/returning.out index efe2ec0510..32568ccc2b 100644 --- a/src/test/regress/expected/returning.out +++ b/src/test/regress/expected/returning.out @@ -152,11 +152,11 @@ SELECT * FROM foochild; UPDATE foo SET f3 = f3*2 FROM int8_tbl i - WHERE foo.f1 = i.q1 + WHERE foo.f1 = i.q2 RETURNING *; - f1 | f2 | f3 | f4 | q1 | q2 ------+-------+------+------+-----+----- - 123 | child | 1998 | 1098 | 123 | 456 + f1 | f2 | f3 | f4 | q1 | q2 +-----+-------+------+------+------------------+----- + 123 | child | 1998 | 1098 | 4567890123456789 | 123 (1 row) SELECT * FROM foo; @@ -174,11 +174,11 @@ SELECT * FROM foochild; DELETE FROM foo USING int8_tbl i - WHERE foo.f1 = i.q1 + WHERE foo.f1 = i.q2 RETURNING *; - f1 | f2 | f3 | f4 | q1 | q2 ------+-------+------+------+-----+----- - 123 | child | 1998 | 1098 | 123 | 456 + f1 | f2 | f3 | f4 | q1 | q2 +-----+-------+------+------+------------------+----- + 123 | child | 1998 | 1098 | 4567890123456789 | 123 (1 row) SELECT * FROM foo; diff --git a/src/test/regress/sql/returning.sql b/src/test/regress/sql/returning.sql index a16ac63129..7a0dc8f845 100644 --- a/src/test/regress/sql/returning.sql +++ b/src/test/regress/sql/returning.sql @@ -70,7 +70,7 @@ SELECT * FROM foochild; UPDATE foo SET f3 = f3*2 FROM int8_tbl i - WHERE foo.f1 = i.q1 + WHERE foo.f1 = i.q2 RETURNING *; SELECT * FROM foo; @@ -78,7 +78,7 @@ SELECT * FROM foochild; DELETE FROM foo USING int8_tbl i - WHERE foo.f1 = i.q1 + WHERE foo.f1 = i.q2 RETURNING *; SELECT * FROM foo; -- 2.40.0