Skip to content

Commit 3451abf

Browse files
committed
Make these self-contained tests...they are testing types, so the tables
that are created should only exist as long as the test requires them... things are just toooooo spread around
1 parent b29c2da commit 3451abf

18 files changed

+22
-56
lines changed

src/test/regress/sql/boolean.sql

Lines changed: 5 additions & 1 deletion
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.1 1997/04/05 11:08:15 scrappy Exp $
4+
-- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.2 1997/04/27 04:35:02 scrappy Exp $
55
--
66

77
--
@@ -93,3 +93,7 @@ SELECT '' AS ff_4, BOOLTBL1.*, BOOLTBL2.*
9393

9494
SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.*
9595
WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool;
96+
97+
DROP TABLE BOOLTBL1;
98+
99+
DROP TABLE BOOLTBL2;

src/test/regress/sql/box.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ SELECT '' AS one, b1.*, b2.*
114114
FROM BOX_TBL b1, BOX_TBL b2
115115
WHERE b1.f1 ~ b2.f1 and not b1.f1 ~= b2.f1;
116116

117-
117+
DROP TABLE BOX_TBL;

src/test/regress/sql/char.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,5 @@ SELECT '' AS two, c.*
4949
FROM CHAR_TBL c
5050
WHERE c.f1 >= 'a';
5151

52+
DROP TABLE CHAR_TBL;
5253

src/test/regress/sql/char16.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ SELECT '' AS three, c.f1 FROM CHAR16_TBL c WHERE c.f1 ~ '[0-9]';
4242

4343
SELECT '' AS two, c.f1 FROM CHAR16_TBL c WHERE c.f1 ~ '.*asdf.*';
4444

45-
45+
DROP TABLE CHAR16_TBL;

src/test/regress/sql/char2.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ SELECT '' AS one, c.f1 FROM CHAR2_TBL c WHERE c.f1 ~ '34';
4242

4343
SELECT '' AS one, c.f1 FROM CHAR2_TBL c WHERE c.f1 ~ '3.*';
4444

45-
46-
45+
DROP TABLE CHAR2_TBL;

src/test/regress/sql/char4.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ SELECT '' AS zero, c.f1 FROM CHAR4_TBL c WHERE c.f1 !~ '.*';
4040

4141
SELECT '' AS three, c.f1 FROM CHAR4_TBL c WHERE c.f1 ~ '.*34.*';
4242

43-
43+
DROP TABLE CHAR4_TBL;

src/test/regress/sql/char8.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ SELECT '' AS four, c.f1 FROM CHAR8_TBL c WHERE c.f1 ~ '[0-9]';
4242

4343
SELECT '' AS three, c.f1 FROM CHAR8_TBL c WHERE c.f1 ~ '.*34.*';
4444

45-
46-
45+
DROP TABLE CHAR8_TBL;

src/test/regress/sql/destroy.sql

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--
22
-- destroy.source
33
--
4-
-- $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/destroy.sql,v 1.1 1997/04/27 03:56:20 scrappy Exp $
4+
-- $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/destroy.sql,v 1.2 1997/04/27 04:35:31 scrappy Exp $
55
--
66

77
--
@@ -230,49 +230,12 @@ DROP TABLE bt_txt_heap;
230230
DROP TABLE bt_f8_heap;
231231

232232

233-
DROP TABLE BOOLTBL1;
234-
235-
DROP TABLE BOOLTBL2;
236-
237233
DROP TABLE ABSTIME_TBL;
238234

239235
DROP TABLE RELTIME_TBL;
240236

241237
DROP TABLE TINTERVAL_TBL;
242238

243-
DROP TABLE BOX_TBL;
244-
245-
DROP TABLE CHAR_TBL;
246-
247-
DROP TABLE CHAR2_TBL;
248-
249-
DROP TABLE CHAR4_TBL;
250-
251-
DROP TABLE CHAR8_TBL;
252-
253-
DROP TABLE CHAR16_TBL;
254-
255-
DROP TABLE FLOAT4_TBL;
256-
257-
DROP TABLE FLOAT8_TBL;
258-
259-
DROP TABLE INT2_TBL;
260-
261-
DROP TABLE INT4_TBL;
262-
263-
DROP TABLE OID_TBL;
264-
265-
DROP TABLE OIDNAME_TBL;
266-
267-
DROP TABLE OIDINT2_TBL;
268-
269-
DROP TABLE OIDINT4_TBL;
270-
271-
DROP TABLE POINT_TBL;
272-
273-
DROP TABLE POLYGON_TBL;
274-
275-
276239
--
277240
-- VIRTUAL CLASS REMOVAL
278241
-- (also tests removal of rewrite rules)

src/test/regress/sql/float4.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ UPDATE FLOAT4_TBL
6262

6363
SELECT '' AS five, FLOAT4_TBL.*;
6464

65-
65+
DROP TABLE FLOAT4_TBL;

src/test/regress/sql/float8.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
101101

102102
SELECT '' AS five, FLOAT8_TBL.*;
103103

104-
104+
DROP TABLE FLOAT8_TBL;

src/test/regress/sql/int2.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,4 @@ SELECT '' AS five, i.f1, i.f1 / '2'::int2 AS x FROM INT2_TBL i;
7373

7474
SELECT '' AS five, i.f1, i.f1 / '2'::int4 AS x FROM INT2_TBL i;
7575

76-
77-
76+
DROP TABLE INT2_TBL;

src/test/regress/sql/int4.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,4 @@ SELECT |/'64'::float8 AS eight;
101101

102102
SELECT ||/'27'::float8 AS three;
103103

104-
105-
104+
DROP TABLE INT4_TBL;

src/test/regress/sql/oid.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ SELECT '' AS two, o.* FROM OID_TBL o WHERE o.f1 >= '1234';
2929

3030
SELECT '' AS one, o.* FROM OID_TBL o WHERE o.f1 > '1234';
3131

32-
32+
DROP TABLE OID_TBL;

src/test/regress/sql/oidint2.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ SELECT '' AS two, o.* FROM OIDINT2_TBL o WHERE o.f1 >= '1235/9873';
4444

4545
SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 > '1235/9873';
4646

47-
47+
DROP TABLE OIDINT2_TBL;

src/test/regress/sql/oidint4.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ SELECT '' AS two, o.* FROM OIDINT4_TBL o WHERE o.f1 >= '1235/9873';
4343

4444
SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 > '1235/9873';
4545

46-
46+
DROP TABLE OIDINT4_TBL;

src/test/regress/sql/oidname.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ SELECT '' AS three, o.* FROM OIDNAME_TBL o WHERE o.f1 >= '1234,abcd';
3636

3737
SELECT '' AS two, o.* FROM OIDNAME_TBL o WHERE o.f1 > '1234,abcd';
3838

39-
39+
DROP TABLE OIDNAME_TBL;

src/test/regress/sql/point.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,4 @@ SELECT '' AS three, p1.f1, p2.f1
6969
p1.f1 !< p2.f1 and
7070
p1.f1 !^ p2.f1;
7171

72+
DROP TABLE POINT_TBL;

src/test/regress/sql/polygon.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,4 @@ SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon ~= '(3.0,3.0,1.0,1.0,3.0,0.0)'::poly
115115
-- overlap
116116
SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon && '(3.0,3.0,1.0,1.0,3.0,0.0)'::polygon AS true;
117117

118+
DROP TABLE POLYGON_TBL;

0 commit comments

Comments
 (0)