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

18 files changed, 22 insertions, 56 deletions

diff --git a/src/test/regress/sql/boolean.sql b/src/test/regress/sql/boolean.sql
index 8fbe5edb8cf..6005ad64bd7 100644
--- a/src/test/regress/sql/boolean.sql
+++ b/src/test/regress/sql/boolean.sql
@@ -1,7 +1,7 @@
 --
 -- boolean.source
 --
--- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.1 1997/04/05 11:08:15 scrappy Exp $
+-- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.2 1997/04/27 04:35:02 scrappy Exp $
 --
 
 --
@@ -93,3 +93,7 @@ SELECT '' AS ff_4, BOOLTBL1.*, BOOLTBL2.*
 
 SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.*
    WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool;
+
+DROP TABLE  BOOLTBL1;
+
+DROP TABLE  BOOLTBL2;
diff --git a/src/test/regress/sql/box.sql b/src/test/regress/sql/box.sql
index f350e12e8a4..b6197cc9ac8 100644
--- a/src/test/regress/sql/box.sql
+++ b/src/test/regress/sql/box.sql
@@ -114,4 +114,4 @@ SELECT '' AS one, b1.*, b2.*
    FROM BOX_TBL b1, BOX_TBL b2 
    WHERE b1.f1 ~ b2.f1 and not b1.f1 ~= b2.f1;
 
-
+DROP TABLE  BOX_TBL;
diff --git a/src/test/regress/sql/char.sql b/src/test/regress/sql/char.sql
index 20c2826c60b..8dd7bdc22d2 100644
--- a/src/test/regress/sql/char.sql
+++ b/src/test/regress/sql/char.sql
@@ -49,4 +49,5 @@ SELECT '' AS two, c.*
    FROM CHAR_TBL c
    WHERE c.f1 >= 'a';
 
+DROP TABLE CHAR_TBL;
 
diff --git a/src/test/regress/sql/char16.sql b/src/test/regress/sql/char16.sql
index 75f109c8656..d1d5ea1d470 100644
--- a/src/test/regress/sql/char16.sql
+++ b/src/test/regress/sql/char16.sql
@@ -42,4 +42,4 @@ SELECT '' AS three, c.f1 FROM CHAR16_TBL c WHERE c.f1 ~ '[0-9]';
 
 SELECT '' AS two, c.f1 FROM CHAR16_TBL c WHERE c.f1 ~ '.*asdf.*';
 
-
+DROP TABLE CHAR16_TBL;
diff --git a/src/test/regress/sql/char2.sql b/src/test/regress/sql/char2.sql
index da0d152d2a4..6a578f352a5 100644
--- a/src/test/regress/sql/char2.sql
+++ b/src/test/regress/sql/char2.sql
@@ -42,5 +42,4 @@ SELECT '' AS one, c.f1 FROM CHAR2_TBL c WHERE c.f1 ~ '34';
 
 SELECT '' AS one, c.f1 FROM CHAR2_TBL c WHERE c.f1 ~ '3.*';
 
-
-
+DROP TABLE CHAR2_TBL;
diff --git a/src/test/regress/sql/char4.sql b/src/test/regress/sql/char4.sql
index 338a2857781..5455557ef03 100644
--- a/src/test/regress/sql/char4.sql
+++ b/src/test/regress/sql/char4.sql
@@ -40,4 +40,4 @@ SELECT '' AS zero, c.f1 FROM CHAR4_TBL c WHERE c.f1 !~ '.*';
 
 SELECT '' AS three, c.f1 FROM CHAR4_TBL c WHERE c.f1 ~ '.*34.*';
 
-
+DROP TABLE  CHAR4_TBL;
diff --git a/src/test/regress/sql/char8.sql b/src/test/regress/sql/char8.sql
index c3ac9f32121..33adde43372 100644
--- a/src/test/regress/sql/char8.sql
+++ b/src/test/regress/sql/char8.sql
@@ -42,5 +42,4 @@ SELECT '' AS four, c.f1 FROM CHAR8_TBL c WHERE c.f1 ~ '[0-9]';
 
 SELECT '' AS three, c.f1 FROM CHAR8_TBL c WHERE c.f1 ~ '.*34.*';
 
-
-
+DROP TABLE  CHAR8_TBL;
diff --git a/src/test/regress/sql/destroy.sql b/src/test/regress/sql/destroy.sql
index 8f32eb5d8b8..345af37c36f 100644
--- a/src/test/regress/sql/destroy.sql
+++ b/src/test/regress/sql/destroy.sql
@@ -1,7 +1,7 @@
 --
 -- destroy.source
 --
--- $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/destroy.sql,v 1.1 1997/04/27 03:56:20 scrappy Exp $
+-- $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/destroy.sql,v 1.2 1997/04/27 04:35:31 scrappy Exp $
 --
 
 --
@@ -230,49 +230,12 @@ DROP TABLE  bt_txt_heap;
 DROP TABLE  bt_f8_heap;
 
 
-DROP TABLE  BOOLTBL1;
-
-DROP TABLE  BOOLTBL2;
-
 DROP TABLE  ABSTIME_TBL;
 
 DROP TABLE  RELTIME_TBL;
 
 DROP TABLE  TINTERVAL_TBL;
 
-DROP TABLE  BOX_TBL;
-
-DROP TABLE  CHAR_TBL;
-
-DROP TABLE  CHAR2_TBL;
-
-DROP TABLE  CHAR4_TBL;
-
-DROP TABLE  CHAR8_TBL;
-
-DROP TABLE  CHAR16_TBL;
-
-DROP TABLE  FLOAT4_TBL;
-
-DROP TABLE  FLOAT8_TBL;
-
-DROP TABLE  INT2_TBL;
-
-DROP TABLE  INT4_TBL;
-
-DROP TABLE  OID_TBL;
-
-DROP TABLE  OIDNAME_TBL;
-
-DROP TABLE  OIDINT2_TBL;
-
-DROP TABLE  OIDINT4_TBL;
-
-DROP TABLE  POINT_TBL;
-
-DROP TABLE  POLYGON_TBL;
-
-
 --
 -- VIRTUAL CLASS REMOVAL
 --	(also tests removal of rewrite rules)
diff --git a/src/test/regress/sql/float4.sql b/src/test/regress/sql/float4.sql
index f5e7866b2b5..518cc902cb0 100644
--- a/src/test/regress/sql/float4.sql
+++ b/src/test/regress/sql/float4.sql
@@ -62,4 +62,4 @@ UPDATE FLOAT4_TBL
 
 SELECT '' AS five, FLOAT4_TBL.*;
 
-
+DROP TABLE  FLOAT4_TBL;
diff --git a/src/test/regress/sql/float8.sql b/src/test/regress/sql/float8.sql
index e31b1c0ffdd..e55f6c7f24e 100644
--- a/src/test/regress/sql/float8.sql
+++ b/src/test/regress/sql/float8.sql
@@ -101,4 +101,4 @@ SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
 
 SELECT '' AS five, FLOAT8_TBL.*;
 
-
+DROP TABLE  FLOAT8_TBL;
diff --git a/src/test/regress/sql/int2.sql b/src/test/regress/sql/int2.sql
index 3c4c6793c97..cc46babbab1 100644
--- a/src/test/regress/sql/int2.sql
+++ b/src/test/regress/sql/int2.sql
@@ -73,5 +73,4 @@ SELECT '' AS five, i.f1, i.f1 / '2'::int2 AS x FROM INT2_TBL i;
 
 SELECT '' AS five, i.f1, i.f1 / '2'::int4 AS x FROM INT2_TBL i;
 
-
-
+DROP TABLE  INT2_TBL;
diff --git a/src/test/regress/sql/int4.sql b/src/test/regress/sql/int4.sql
index f701c2e196b..4dd1352a0f8 100644
--- a/src/test/regress/sql/int4.sql
+++ b/src/test/regress/sql/int4.sql
@@ -101,5 +101,4 @@ SELECT |/'64'::float8 AS eight;
 
 SELECT ||/'27'::float8 AS three;
 
-
-
+DROP TABLE  INT4_TBL;
diff --git a/src/test/regress/sql/oid.sql b/src/test/regress/sql/oid.sql
index 2ffb22b4e4b..ae337e05fa6 100644
--- a/src/test/regress/sql/oid.sql
+++ b/src/test/regress/sql/oid.sql
@@ -29,4 +29,4 @@ SELECT '' AS two, o.* FROM OID_TBL o WHERE o.f1 >= '1234';
 
 SELECT '' AS one, o.* FROM OID_TBL o WHERE o.f1 > '1234';
 
-
+DROP TABLE  OID_TBL;
diff --git a/src/test/regress/sql/oidint2.sql b/src/test/regress/sql/oidint2.sql
index b87b6fab3d2..f1966844d2c 100644
--- a/src/test/regress/sql/oidint2.sql
+++ b/src/test/regress/sql/oidint2.sql
@@ -44,4 +44,4 @@ SELECT '' AS two, o.* FROM OIDINT2_TBL o WHERE o.f1 >= '1235/9873';
 
 SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 > '1235/9873';
 
-
+DROP TABLE  OIDINT2_TBL;
diff --git a/src/test/regress/sql/oidint4.sql b/src/test/regress/sql/oidint4.sql
index ce359b2701f..99549c99ca8 100644
--- a/src/test/regress/sql/oidint4.sql
+++ b/src/test/regress/sql/oidint4.sql
@@ -43,4 +43,4 @@ SELECT '' AS two, o.* FROM OIDINT4_TBL o WHERE o.f1 >= '1235/9873';
 
 SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 > '1235/9873';
 
-
+DROP TABLE  OIDINT4_TBL;
diff --git a/src/test/regress/sql/oidname.sql b/src/test/regress/sql/oidname.sql
index 14812370aab..65fccc3c06f 100644
--- a/src/test/regress/sql/oidname.sql
+++ b/src/test/regress/sql/oidname.sql
@@ -36,4 +36,4 @@ SELECT '' AS three, o.* FROM OIDNAME_TBL o WHERE o.f1 >= '1234,abcd';
 
 SELECT '' AS two, o.* FROM OIDNAME_TBL o WHERE o.f1 > '1234,abcd';
 
-
+DROP TABLE  OIDNAME_TBL;
diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql
index 452008b2db1..a316cf14a82 100644
--- a/src/test/regress/sql/point.sql
+++ b/src/test/regress/sql/point.sql
@@ -69,3 +69,4 @@ SELECT '' AS three, p1.f1, p2.f1
 	p1.f1 !< p2.f1 and
 	p1.f1 !^ p2.f1;
 
+DROP TABLE  POINT_TBL;
diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql
index f8928545a21..cb6c7b5b28c 100644
--- a/src/test/regress/sql/polygon.sql
+++ b/src/test/regress/sql/polygon.sql
@@ -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
 -- overlap 
 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;
 
+DROP TABLE  POLYGON_TBL;