aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-08-13 17:58:49 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-08-13 17:58:49 +0000
commitd2ccc707af4d0eb45b907383f6b274060d1f6e16 (patch)
tree5287d11aa2a48317eb868f00c859b77e8367fcda
parent12cf0fdf19d0dc992eea6f8ee63fd146f3d92696 (diff)
downloadpostgresql-d2ccc707af4d0eb45b907383f6b274060d1f6e16.tar.gz
postgresql-d2ccc707af4d0eb45b907383f6b274060d1f6e16.zip
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.
-rw-r--r--src/test/regress/expected/returning.out16
-rw-r--r--src/test/regress/sql/returning.sql4
2 files changed, 10 insertions, 10 deletions
diff --git a/src/test/regress/expected/returning.out b/src/test/regress/expected/returning.out
index efe2ec0510e..32568ccc2b7 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 a16ac63129e..7a0dc8f8455 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;