Skip to content

Commit 6ef382c

Browse files
scrappyscrappy
committed
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.
1 parent 91f4df2 commit 6ef382c

File tree

6 files changed

+59
-53
lines changed

6 files changed

+59
-53
lines changed

‎src/test/regress/expected/boolean.out

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,25 +156,26 @@ ff_4|f1|f1
156156
(4 rows)
157157

158158
QUERY: SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.*
159-
WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool;
159+
WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool
160+
ORDER BY BOOLTBL1.f1, BOOLTBL2.f1;
160161
tf_12_ff_4|f1|f1
161162
----------+--+--
163+
|f |f
164+
|f |f
165+
|f |f
166+
|f |f
162167
|t |f
163168
|t |f
164169
|t |f
165-
|f |f
166170
|t |f
167171
|t |f
168172
|t |f
169-
|f |f
170173
|t |f
171174
|t |f
172175
|t |f
173-
|f |f
174176
|t |f
175177
|t |f
176178
|t |f
177-
|f |f
178179
(16 rows)
179180

180181
QUERY: DROP TABLE BOOLTBL1;

‎src/test/regress/expected/reltime.out

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,24 @@ five|f1
7777

7878
QUERY: SELECT '' AS fifteen, r1.*, r2.*
7979
FROM RELTIME_TBL r1, RELTIME_TBL r2
80-
WHERE r1.f1 > r2.f1;
80+
WHERE r1.f1 > r2.f1
81+
ORDER BY r1.f1, r2.f1;
8182
fifteen|f1 |f1
8283
-------+----------+----------------
84+
|@ 1 minute|@ 14 seconds ago
85+
|@ 5 hours |@ 14 seconds ago
8386
|@ 5 hours |@ 1 minute
87+
|@ 10 days |@ 14 seconds ago
8488
|@ 10 days |@ 1 minute
85-
|@ 34 years|@ 1 minute
86-
|@ 3 months|@ 1 minute
8789
|@ 10 days |@ 5 hours
88-
|@ 34 years|@ 5 hours
90+
|@ 3 months|@ 14 seconds ago
91+
|@ 3 months|@ 1 minute
8992
|@ 3 months|@ 5 hours
90-
|@ 34 years|@ 10 days
9193
|@ 3 months|@ 10 days
92-
|@ 34 years|@ 3 months
93-
|@ 1 minute|@ 14 seconds ago
94-
|@ 5 hours |@ 14 seconds ago
95-
|@ 10 days |@ 14 seconds ago
9694
|@ 34 years|@ 14 seconds ago
97-
|@ 3 months|@ 14 seconds ago
95+
|@ 34 years|@ 1 minute
96+
|@ 34 years|@ 5 hours
97+
|@ 34 years|@ 10 days
98+
|@ 34 years|@ 3 months
9899
(15 rows)
99100

‎src/test/regress/expected/timespan.out

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -96,53 +96,54 @@ nine|f1
9696

9797
QUERY: SELECT '' AS fortyfive, r1.*, r2.*
9898
FROM TIMESPAN_TBL r1, TIMESPAN_TBL r2
99-
WHERE r1.f1 > r2.f1;
99+
WHERE r1.f1 > r2.f1
100+
ORDER BY r1.f1, r2.f1;
100101
fortyfive|f1 |f1
101102
---------+-----------------------------+-----------------------------
103+
|@ 1 min |@ 14 secs ago
104+
|@ 5 hours |@ 14 secs ago
102105
|@ 5 hours |@ 1 min
103-
|@ 10 days |@ 1 min
104-
|@ 34 years |@ 1 min
105-
|@ 3 mons |@ 1 min
106+
|@ 1 day 2 hours 3 mins 4 secs|@ 14 secs ago
106107
|@ 1 day 2 hours 3 mins 4 secs|@ 1 min
107-
|@ 6 years |@ 1 min
108-
|@ 5 mons |@ 1 min
109-
|@ 5 mons 12 hours |@ 1 min
108+
|@ 1 day 2 hours 3 mins 4 secs|@ 5 hours
109+
|@ 10 days |@ 14 secs ago
110+
|@ 10 days |@ 1 min
110111
|@ 10 days |@ 5 hours
111-
|@ 34 years |@ 5 hours
112+
|@ 10 days |@ 1 day 2 hours 3 mins 4 secs
113+
|@ 3 mons |@ 14 secs ago
114+
|@ 3 mons |@ 1 min
112115
|@ 3 mons |@ 5 hours
113-
|@ 1 day 2 hours 3 mins 4 secs|@ 5 hours
114-
|@ 6 years |@ 5 hours
115-
|@ 5 mons |@ 5 hours
116-
|@ 5 mons 12 hours |@ 5 hours
117-
|@ 34 years |@ 10 days
116+
|@ 3 mons |@ 1 day 2 hours 3 mins 4 secs
118117
|@ 3 mons |@ 10 days
119-
|@ 6 years |@ 10 days
118+
|@ 5 mons |@ 14 secs ago
119+
|@ 5 mons |@ 1 min
120+
|@ 5 mons |@ 5 hours
121+
|@ 5 mons |@ 1 day 2 hours 3 mins 4 secs
120122
|@ 5 mons |@ 10 days
121-
|@ 5 mons 12 hours |@ 10 days
122-
|@ 34 years |@ 3 mons
123-
|@ 6 years |@ 3 mons
124123
|@ 5 mons |@ 3 mons
124+
|@ 5 mons 12 hours |@ 14 secs ago
125+
|@ 5 mons 12 hours |@ 1 min
126+
|@ 5 mons 12 hours |@ 5 hours
127+
|@ 5 mons 12 hours |@ 1 day 2 hours 3 mins 4 secs
128+
|@ 5 mons 12 hours |@ 10 days
125129
|@ 5 mons 12 hours |@ 3 mons
126-
|@ 1 min |@ 14 secs ago
127-
|@ 5 hours |@ 14 secs ago
128-
|@ 10 days |@ 14 secs ago
129-
|@ 34 years |@ 14 secs ago
130-
|@ 3 mons |@ 14 secs ago
131-
|@ 1 day 2 hours 3 mins 4 secs|@ 14 secs ago
130+
|@ 5 mons 12 hours |@ 5 mons
132131
|@ 6 years |@ 14 secs ago
133-
|@ 5 mons |@ 14 secs ago
134-
|@ 5 mons 12 hours |@ 14 secs ago
135-
|@ 10 days |@ 1 day 2 hours 3 mins 4 secs
136-
|@ 34 years |@ 1 day 2 hours 3 mins 4 secs
137-
|@ 3 mons |@ 1 day 2 hours 3 mins 4 secs
132+
|@ 6 years |@ 1 min
133+
|@ 6 years |@ 5 hours
138134
|@ 6 years |@ 1 day 2 hours 3 mins 4 secs
139-
|@ 5 mons |@ 1 day 2 hours 3 mins 4 secs
140-
|@ 5 mons 12 hours |@ 1 day 2 hours 3 mins 4 secs
141-
|@ 34 years |@ 6 years
142-
|@ 34 years |@ 5 mons
135+
|@ 6 years |@ 10 days
136+
|@ 6 years |@ 3 mons
143137
|@ 6 years |@ 5 mons
144-
|@ 5 mons 12 hours |@ 5 mons
145-
|@ 34 years |@ 5 mons 12 hours
146138
|@ 6 years |@ 5 mons 12 hours
139+
|@ 34 years |@ 14 secs ago
140+
|@ 34 years |@ 1 min
141+
|@ 34 years |@ 5 hours
142+
|@ 34 years |@ 1 day 2 hours 3 mins 4 secs
143+
|@ 34 years |@ 10 days
144+
|@ 34 years |@ 3 mons
145+
|@ 34 years |@ 5 mons
146+
|@ 34 years |@ 5 mons 12 hours
147+
|@ 34 years |@ 6 years
147148
(45 rows)
148149

‎src/test/regress/sql/boolean.sql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--
22
-- boolean.source
33
--
4-
-- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.2 1997/04/27 04:35:02 scrappy Exp $
4+
-- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.3 1997/05/09 03:26:43 scrappy Exp $
55
--
66

77
--
@@ -92,7 +92,8 @@ SELECT '' AS ff_4, BOOLTBL1.*, BOOLTBL2.*
9292

9393

9494
SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.*
95-
WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool;
95+
WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool
96+
ORDER BY BOOLTBL1.f1, BOOLTBL2.f1;
9697

9798
DROP TABLE BOOLTBL1;
9899

‎src/test/regress/sql/reltime.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ SELECT '' AS five, RELTIME_TBL.*
4242

4343
SELECT '' AS fifteen, r1.*, r2.*
4444
FROM RELTIME_TBL r1, RELTIME_TBL r2
45-
WHERE r1.f1 > r2.f1;
45+
WHERE r1.f1 > r2.f1
46+
ORDER BY r1.f1, r2.f1;
4647

‎src/test/regress/sql/timespan.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@ SELECT '' AS nine, TIMESPAN_TBL.*
3939

4040
SELECT '' AS fortyfive, r1.*, r2.*
4141
FROM TIMESPAN_TBL r1, TIMESPAN_TBL r2
42-
WHERE r1.f1 > r2.f1;
42+
WHERE r1.f1 > r2.f1
43+
ORDER BY r1.f1, r2.f1;
4344

0 commit comments

Comments
 (0)