Skip to content

P
Postgres FD Implementation
Commit 6ef382c6 authored by Marc G. Fournier's avatar Marc G. Fournier
Browse files
Options

From: Keith Parks <emkxp01@mtcc.demon.co.uk> 

Subject: [PATCHES] Patches for boolean, timespan and reltime regression tests.

Hi All,

Here are a couple of patches to the regression tests to introduce
some specific ordering to the results.

I've only made changes to the queries that were exhibiting differences
on my regression runs.

This will also have the side effect of testing the ordering code for
the boolean and some of the time types.
parent 91f4df2f
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 53 deletions
src/test/regress/expected/boolean.out
View file @ 6ef382c6
......@@ -156,25 +156,26 @@ ff_4|f1|f1
(4 rows)
QUERY: SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.*
WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool;
WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool
ORDER BY BOOLTBL1.f1, BOOLTBL2.f1;
tf_12_ff_4|f1|f1
----------+--+--
|f |f
|f |f
|f |f
|f |f
|t |f
|t |f
|t |f
|f |f
|t |f
|t |f
|t |f
|f |f
|t |f
|t |f
|t |f
|f |f
|t |f
|t |f
|t |f
|f |f
(16 rows)
QUERY: DROP TABLE BOOLTBL1;
......
src/test/regress/expected/reltime.out
View file @ 6ef382c6
......@@ -77,23 +77,24 @@ five|f1
QUERY: SELECT '' AS fifteen, r1.*, r2.*
FROM RELTIME_TBL r1, RELTIME_TBL r2
WHERE r1.f1 > r2.f1;
WHERE r1.f1 > r2.f1
ORDER BY r1.f1, r2.f1;
fifteen|f1 |f1
-------+----------+----------------
|@ 1 minute|@ 14 seconds ago
|@ 5 hours |@ 14 seconds ago
|@ 5 hours |@ 1 minute
|@ 10 days |@ 14 seconds ago
|@ 10 days |@ 1 minute
|@ 34 years|@ 1 minute
|@ 3 months|@ 1 minute
|@ 10 days |@ 5 hours
|@ 34 years|@ 5 hours
|@ 3 months|@ 14 seconds ago
|@ 3 months|@ 1 minute
|@ 3 months|@ 5 hours
|@ 34 years|@ 10 days
|@ 3 months|@ 10 days
|@ 34 years|@ 3 months
|@ 1 minute|@ 14 seconds ago
|@ 5 hours |@ 14 seconds ago
|@ 10 days |@ 14 seconds ago
|@ 34 years|@ 14 seconds ago
|@ 3 months|@ 14 seconds ago
|@ 34 years|@ 1 minute
|@ 34 years|@ 5 hours
|@ 34 years|@ 10 days
|@ 34 years|@ 3 months
(15 rows)
src/test/regress/expected/timespan.out
View file @ 6ef382c6
......@@ -96,53 +96,54 @@ nine|f1
QUERY: SELECT '' AS fortyfive, r1.*, r2.*
FROM TIMESPAN_TBL r1, TIMESPAN_TBL r2
WHERE r1.f1 > r2.f1;
WHERE r1.f1 > r2.f1
ORDER BY r1.f1, r2.f1;
fortyfive|f1 |f1
---------+-----------------------------+-----------------------------
|@ 1 min |@ 14 secs ago
|@ 5 hours |@ 14 secs ago
|@ 5 hours |@ 1 min
|@ 10 days |@ 1 min
|@ 34 years |@ 1 min
|@ 3 mons |@ 1 min
|@ 1 day 2 hours 3 mins 4 secs|@ 14 secs ago
|@ 1 day 2 hours 3 mins 4 secs|@ 1 min
|@ 6 years |@ 1 min
|@ 5 mons |@ 1 min
|@ 5 mons 12 hours |@ 1 min
|@ 1 day 2 hours 3 mins 4 secs|@ 5 hours
|@ 10 days |@ 14 secs ago
|@ 10 days |@ 1 min
|@ 10 days |@ 5 hours
|@ 34 years |@ 5 hours
|@ 10 days |@ 1 day 2 hours 3 mins 4 secs
|@ 3 mons |@ 14 secs ago
|@ 3 mons |@ 1 min
|@ 3 mons |@ 5 hours
|@ 1 day 2 hours 3 mins 4 secs|@ 5 hours
|@ 6 years |@ 5 hours
|@ 5 mons |@ 5 hours
|@ 5 mons 12 hours |@ 5 hours
|@ 34 years |@ 10 days
|@ 3 mons |@ 1 day 2 hours 3 mins 4 secs
|@ 3 mons |@ 10 days
|@ 6 years |@ 10 days
|@ 5 mons |@ 14 secs ago
|@ 5 mons |@ 1 min
|@ 5 mons |@ 5 hours
|@ 5 mons |@ 1 day 2 hours 3 mins 4 secs
|@ 5 mons |@ 10 days
|@ 5 mons 12 hours |@ 10 days
|@ 34 years |@ 3 mons
|@ 6 years |@ 3 mons
|@ 5 mons |@ 3 mons
|@ 5 mons 12 hours |@ 14 secs ago
|@ 5 mons 12 hours |@ 1 min
|@ 5 mons 12 hours |@ 5 hours
|@ 5 mons 12 hours |@ 1 day 2 hours 3 mins 4 secs
|@ 5 mons 12 hours |@ 10 days
|@ 5 mons 12 hours |@ 3 mons
|@ 1 min |@ 14 secs ago
|@ 5 hours |@ 14 secs ago
|@ 10 days |@ 14 secs ago
|@ 34 years |@ 14 secs ago
|@ 3 mons |@ 14 secs ago
|@ 1 day 2 hours 3 mins 4 secs|@ 14 secs ago
|@ 5 mons 12 hours |@ 5 mons
|@ 6 years |@ 14 secs ago
|@ 5 mons |@ 14 secs ago
|@ 5 mons 12 hours |@ 14 secs ago
|@ 10 days |@ 1 day 2 hours 3 mins 4 secs
|@ 34 years |@ 1 day 2 hours 3 mins 4 secs
|@ 3 mons |@ 1 day 2 hours 3 mins 4 secs
|@ 6 years |@ 1 min
|@ 6 years |@ 5 hours
|@ 6 years |@ 1 day 2 hours 3 mins 4 secs
|@ 5 mons |@ 1 day 2 hours 3 mins 4 secs
|@ 5 mons 12 hours |@ 1 day 2 hours 3 mins 4 secs
|@ 34 years |@ 6 years
|@ 34 years |@ 5 mons
|@ 6 years |@ 10 days
|@ 6 years |@ 3 mons
|@ 6 years |@ 5 mons
|@ 5 mons 12 hours |@ 5 mons
|@ 34 years |@ 5 mons 12 hours
|@ 6 years |@ 5 mons 12 hours
|@ 34 years |@ 14 secs ago
|@ 34 years |@ 1 min
|@ 34 years |@ 5 hours
|@ 34 years |@ 1 day 2 hours 3 mins 4 secs
|@ 34 years |@ 10 days
|@ 34 years |@ 3 mons
|@ 34 years |@ 5 mons
|@ 34 years |@ 5 mons 12 hours
|@ 34 years |@ 6 years
(45 rows)
src/test/regress/sql/boolean.sql
View file @ 6ef382c6
--
-- boolean.source
--
-- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.2 1997/04/27 04:35:02 scrappy Exp $
-- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.3 1997/05/09 03:26:43 scrappy Exp $
--
--
......@@ -92,7 +92,8 @@ SELECT '' AS ff_4, BOOLTBL1.*, BOOLTBL2.*
SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.*
WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool;
WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool
ORDER BY BOOLTBL1.f1, BOOLTBL2.f1;
DROP TABLE BOOLTBL1;
......
src/test/regress/sql/reltime.sql
View file @ 6ef382c6
......@@ -42,5 +42,6 @@ SELECT '' AS five, RELTIME_TBL.*
SELECT '' AS fifteen, r1.*, r2.*
FROM RELTIME_TBL r1, RELTIME_TBL r2
WHERE r1.f1 > r2.f1;
WHERE r1.f1 > r2.f1
ORDER BY r1.f1, r2.f1;
src/test/regress/sql/timespan.sql
View file @ 6ef382c6
......@@ -39,5 +39,6 @@ SELECT '' AS nine, TIMESPAN_TBL.*
SELECT '' AS fortyfive, r1.*, r2.*
FROM TIMESPAN_TBL r1, TIMESPAN_TBL r2
WHERE r1.f1 > r2.f1;
WHERE r1.f1 > r2.f1
ORDER BY r1.f1, r2.f1;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment