diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-07-16 20:20:49 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-07-16 20:20:49 +0000 |
| commit | bf84d6e3bb7417e5e84065f2e302fdb76ac4d3f6 (patch) | |
| tree | 17a3f70f266d7746583b685510fb35be2ddf4c49 /src | |
| parent | dc59b4751877374d84e55b01b64046b7515c97de (diff) | |
| download | postgresql-bf84d6e3bb7417e5e84065f2e302fdb76ac4d3f6.tar.gz postgresql-bf84d6e3bb7417e5e84065f2e302fdb76ac4d3f6.zip | |
Back-patch 8.0's tightening of ORDER BY clauses in join regression test,
in hopes of eliminating buildfarm regression failure. (Not clear if we
will need a join_1.out variant in this branch.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/expected/join.out | 12 | ||||
| -rw-r--r-- | src/test/regress/sql/join.sql | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out index 471e149b8c7..7a1da6799e5 100644 --- a/src/test/regress/expected/join.out +++ b/src/test/regress/expected/join.out @@ -1718,7 +1718,7 @@ SELECT '' AS "xxx", * -- SELECT '' AS "xxx", * FROM J1_TBL LEFT OUTER JOIN J2_TBL USING (i) - ORDER BY i; + ORDER BY i, k, t; xxx | i | j | t | k -----+---+---+-------+---- | 0 | | zero | @@ -1738,7 +1738,7 @@ SELECT '' AS "xxx", * SELECT '' AS "xxx", * FROM J1_TBL LEFT JOIN J2_TBL USING (i) - ORDER BY i; + ORDER BY i, k, t; xxx | i | j | t | k -----+---+---+-------+---- | 0 | | zero | @@ -1788,7 +1788,7 @@ SELECT '' AS "xxx", * SELECT '' AS "xxx", * FROM J1_TBL FULL OUTER JOIN J2_TBL USING (i) - ORDER BY i, t; + ORDER BY i, k, t; xxx | i | j | t | k -----+---+---+-------+---- | 0 | | zero | @@ -1802,15 +1802,15 @@ SELECT '' AS "xxx", * | 6 | 6 | six | | 7 | 7 | seven | | 8 | 8 | eight | + | | | | 0 | | | null | | | 0 | zero | | | | | - | | | | 0 (15 rows) SELECT '' AS "xxx", * FROM J1_TBL FULL JOIN J2_TBL USING (i) - ORDER BY i, t; + ORDER BY i, k, t; xxx | i | j | t | k -----+---+---+-------+---- | 0 | | zero | @@ -1824,10 +1824,10 @@ SELECT '' AS "xxx", * | 6 | 6 | six | | 7 | 7 | seven | | 8 | 8 | eight | + | | | | 0 | | | null | | | 0 | zero | | | | | - | | | | 0 (15 rows) SELECT '' AS "xxx", * diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql index 9a286345b14..9bda6f1d002 100644 --- a/src/test/regress/sql/join.sql +++ b/src/test/regress/sql/join.sql @@ -167,11 +167,11 @@ SELECT '' AS "xxx", * SELECT '' AS "xxx", * FROM J1_TBL LEFT OUTER JOIN J2_TBL USING (i) - ORDER BY i; + ORDER BY i, k, t; SELECT '' AS "xxx", * FROM J1_TBL LEFT JOIN J2_TBL USING (i) - ORDER BY i; + ORDER BY i, k, t; SELECT '' AS "xxx", * FROM J1_TBL RIGHT OUTER JOIN J2_TBL USING (i); @@ -181,11 +181,11 @@ SELECT '' AS "xxx", * SELECT '' AS "xxx", * FROM J1_TBL FULL OUTER JOIN J2_TBL USING (i) - ORDER BY i, t; + ORDER BY i, k, t; SELECT '' AS "xxx", * FROM J1_TBL FULL JOIN J2_TBL USING (i) - ORDER BY i, t; + ORDER BY i, k, t; SELECT '' AS "xxx", * FROM J1_TBL LEFT JOIN J2_TBL USING (i) WHERE (k = 1); |