From d1e636881663d15258331a4e6d4c38d072b1db10 Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Thu, 6 Jan 2000 06:41:55 +0000
Subject: [PATCH] Clean up header for uniform appearance throughout tests.

---
 src/test/regress/input/misc.source          |  1 +
 src/test/regress/sql/alter_table.sql        |  1 +
 src/test/regress/sql/btree_index.sql        |  4 ++--
 src/test/regress/sql/case.sql               |  3 +--
 src/test/regress/sql/errors.sql             |  4 +---
 src/test/regress/sql/hash_index.sql         |  3 ++-
 src/test/regress/sql/join.sql               |  3 +--
 src/test/regress/sql/limit.sql              |  1 +
 src/test/regress/sql/plpgsql.sql            | 13 +++++--------
 src/test/regress/sql/portals.sql            |  4 +++-
 src/test/regress/sql/portals_p2.sql         |  5 +++++
 src/test/regress/sql/random.sql             |  4 +++-
 src/test/regress/sql/rules.sql              |  2 +-
 src/test/regress/sql/select.sql             |  3 +++
 src/test/regress/sql/select_distinct.sql    |  5 ++++-
 src/test/regress/sql/select_distinct_on.sql |  6 +++---
 src/test/regress/sql/select_having.sql      |  3 ++-
 src/test/regress/sql/select_implicit.sql    |  5 ++---
 src/test/regress/sql/select_into.sql        |  4 ++++
 src/test/regress/sql/select_views.sql       |  6 +++---
 src/test/regress/sql/subselect.sql          |  2 +-
 src/test/regress/sql/temp.sql               |  2 ++
 src/test/regress/sql/transactions.sql       |  3 ++-
 src/test/regress/sql/union.sql              |  2 +-
 24 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/src/test/regress/input/misc.source b/src/test/regress/input/misc.source
index 2a97cf5c40..7b879bc7ef 100644
--- a/src/test/regress/input/misc.source
+++ b/src/test/regress/input/misc.source
@@ -1,5 +1,6 @@
 --
 -- MISC
+--
 
 --
 -- BTREE
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index d80d1d1156..4358ff083b 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -1,4 +1,5 @@
 --
+-- ALTER_TABLE
 -- add attribute
 --
 
diff --git a/src/test/regress/sql/btree_index.sql b/src/test/regress/sql/btree_index.sql
index 71dcddd0ee..62dd7f72eb 100644
--- a/src/test/regress/sql/btree_index.sql
+++ b/src/test/regress/sql/btree_index.sql
@@ -1,6 +1,6 @@
 --
--- btree index
--- test retrieval of min/max keys for each
+-- BTREE_INDEX
+-- test retrieval of min/max keys for each index
 --
 
 SELECT b.*
diff --git a/src/test/regress/sql/case.sql b/src/test/regress/sql/case.sql
index 0a6b53ddaa..20fbf81153 100644
--- a/src/test/regress/sql/case.sql
+++ b/src/test/regress/sql/case.sql
@@ -1,6 +1,5 @@
 --
--- case.sql
---
+-- CASE
 -- Test the case statement
 --
 
diff --git a/src/test/regress/sql/errors.sql b/src/test/regress/sql/errors.sql
index 225029e306..cd43cb909b 100644
--- a/src/test/regress/sql/errors.sql
+++ b/src/test/regress/sql/errors.sql
@@ -1,8 +1,6 @@
 --
--- errors.source
+-- ERRORS
 --
--- $Header: /cvsroot/pgsql/src/test/regress/sql/errors.sql,v 1.2 1997/05/22 00:17:24 scrappy Exp $
- 
 
 -- bad in postquel, but ok in postsql
 select 1
diff --git a/src/test/regress/sql/hash_index.sql b/src/test/regress/sql/hash_index.sql
index e7e9059924..cfd77d5720 100644
--- a/src/test/regress/sql/hash_index.sql
+++ b/src/test/regress/sql/hash_index.sql
@@ -1,7 +1,8 @@
 --
--- hash index
+-- HASH_INDEX
 -- grep 843938989 hash.data
 --
+
 SELECT hash_i4_heap.* 
    WHERE hash_i4_heap.random = 843938989;
 
diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql
index 9e138d327b..1e6fff03a6 100644
--- a/src/test/regress/sql/join.sql
+++ b/src/test/regress/sql/join.sql
@@ -1,6 +1,5 @@
 --
--- join.sql
---
+-- JOIN
 -- Test join clauses
 --
 
diff --git a/src/test/regress/sql/limit.sql b/src/test/regress/sql/limit.sql
index eb3bf0e793..d9c3688850 100644
--- a/src/test/regress/sql/limit.sql
+++ b/src/test/regress/sql/limit.sql
@@ -1,4 +1,5 @@
 --
+-- LIMIT
 -- Check the LIMIT/OFFSET feature of SELECT
 --
 
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index 510255a15e..c544dbd9df 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -1,10 +1,6 @@
--- ************************************************************
--- * 
--- * Tables for the patchfield test of PL/pgSQL
--- * 
--- * $Header: /cvsroot/pgsql/src/test/regress/sql/plpgsql.sql,v 1.1 1998/10/01 03:38:45 scrappy Exp $
--- * 
--- ************************************************************
+--
+-- PLPGSQL
+--
 
 create table Room (
     roomno	char(8),
@@ -104,7 +100,7 @@ create unique index PHone_name on PHone using btree (slotname bpchar_ops);
 -- * Trigger procedures and functions for the patchfield
 -- * test of PL/pgSQL
 -- * 
--- * $Header: /cvsroot/pgsql/src/test/regress/sql/plpgsql.sql,v 1.1 1998/10/01 03:38:45 scrappy Exp $
+-- * $Header: /cvsroot/pgsql/src/test/regress/sql/plpgsql.sql,v 1.2 2000/01/06 06:41:55 thomas Exp $
 -- * 
 -- ************************************************************
 
@@ -1404,3 +1400,4 @@ insert into HSlot values ('HS', 'base.hub1', 20, '');
 delete from HSlot;
 insert into IFace values ('IF', 'notthere', 'eth0', '');
 insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
+
diff --git a/src/test/regress/sql/portals.sql b/src/test/regress/sql/portals.sql
index 21fd457efb..c4e257ef2d 100644
--- a/src/test/regress/sql/portals.sql
+++ b/src/test/regress/sql/portals.sql
@@ -1,6 +1,7 @@
 --
--- portal manipulation
+-- PORTALS
 --
+
 BEGIN;
 
 DECLARE foo1 CURSOR FOR SELECT * FROM tenk1;
@@ -166,3 +167,4 @@ CLOSE foo11;
 CLOSE foo12;
 
 end;
+
diff --git a/src/test/regress/sql/portals_p2.sql b/src/test/regress/sql/portals_p2.sql
index 91988d54e4..c1c92e1cf2 100644
--- a/src/test/regress/sql/portals_p2.sql
+++ b/src/test/regress/sql/portals_p2.sql
@@ -1,3 +1,7 @@
+--
+-- PORTALS_P2
+--
+
 -- EXTEND INDEX onek2_u1_prtl WHERE onek2.unique1 <= 60;
 
 BEGIN;
@@ -94,3 +98,4 @@ CLOSE foo24;
 CLOSE foo25;
 
 END;
+
diff --git a/src/test/regress/sql/random.sql b/src/test/regress/sql/random.sql
index 6463c7bf8b..1279a8b0f4 100644
--- a/src/test/regress/sql/random.sql
+++ b/src/test/regress/sql/random.sql
@@ -1,6 +1,8 @@
 --
--- test the random function
+-- RANDOM
+-- Test the random function
 --
+
 -- count the number of tuples originally
 SELECT count(*) FROM onek;
 
diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql
index 32c887dd9a..7f44412561 100644
--- a/src/test/regress/sql/rules.sql
+++ b/src/test/regress/sql/rules.sql
@@ -1,5 +1,5 @@
 --
--- rules.sql
+-- RULES
 -- From Jan's original setup_ruletest.sql and run_ruletest.sql
 -- - thomas 1998-09-13
 --
diff --git a/src/test/regress/sql/select.sql b/src/test/regress/sql/select.sql
index f5c17ab71c..3d5e66c98c 100644
--- a/src/test/regress/sql/select.sql
+++ b/src/test/regress/sql/select.sql
@@ -1,4 +1,7 @@
 --
+-- SELECT
+--
+
 -- btree index
 -- awk '{if($1<10){print;}else{next;}}' onek.data | sort +0n -1
 --
diff --git a/src/test/regress/sql/select_distinct.sql b/src/test/regress/sql/select_distinct.sql
index 2bc50d49a1..7cd98002e0 100644
--- a/src/test/regress/sql/select_distinct.sql
+++ b/src/test/regress/sql/select_distinct.sql
@@ -1,3 +1,7 @@
+--
+-- SELECT_DISTINCT
+--
+
 --
 -- awk '{print $3;}' onek.data | sort -n | uniq
 --
@@ -30,4 +34,3 @@ SELECT DISTINCT two, string4, ten
 --
 SELECT DISTINCT p.age FROM person* p ORDER BY age using >;
 
-
diff --git a/src/test/regress/sql/select_distinct_on.sql b/src/test/regress/sql/select_distinct_on.sql
index 4dccedc9d7..87001a0c08 100644
--- a/src/test/regress/sql/select_distinct_on.sql
+++ b/src/test/regress/sql/select_distinct_on.sql
@@ -1,7 +1,7 @@
+--
+-- SELECT_DISTINCT_ON
+--
 
---
--- test select distinct on
---
 SELECT DISTINCT ON string4 two, string4, ten
 	   FROM tmp
    ORDER BY two using <, string4 using <, ten using <;
diff --git a/src/test/regress/sql/select_having.sql b/src/test/regress/sql/select_having.sql
index 95cff8501b..44b0329ee5 100644
--- a/src/test/regress/sql/select_having.sql
+++ b/src/test/regress/sql/select_having.sql
@@ -1,5 +1,5 @@
 --
--- select_having.sql
+-- SELECT_HAVING
 --
 
 -- load test data
@@ -25,3 +25,4 @@ SELECT c, max(a) FROM test_having
 	GROUP BY c HAVING count(*) > 2 OR min(a) = max(a);
 
 DROP TABLE test_having;
+
diff --git a/src/test/regress/sql/select_implicit.sql b/src/test/regress/sql/select_implicit.sql
index 55a6efad05..607ea95bb1 100644
--- a/src/test/regress/sql/select_implicit.sql
+++ b/src/test/regress/sql/select_implicit.sql
@@ -1,10 +1,10 @@
 --
--- select_implicit.sql
---
+-- SELECT_IMPLICIT
 -- Test cases for queries with ordering terms missing from the target list.
 -- This used to be called "junkfilter.sql".
 -- The parser uses the term "resjunk" to handle these cases.
 -- - thomas 1998-07-09
+--
 
 -- load test data
 CREATE TABLE test_missing_target (a int, b int, c char(8), d char);
@@ -149,4 +149,3 @@ DROP TABLE test_missing_target;
 DROP TABLE test_missing_target2;
 DROP TABLE test_missing_target3;
 
-
diff --git a/src/test/regress/sql/select_into.sql b/src/test/regress/sql/select_into.sql
index 8bb90b4f04..91214512ac 100644
--- a/src/test/regress/sql/select_into.sql
+++ b/src/test/regress/sql/select_into.sql
@@ -1,3 +1,7 @@
+--
+-- SELECT_INTO
+--
+
 SELECT *
    INTO TABLE tmp1
    FROM tmp
diff --git a/src/test/regress/sql/select_views.sql b/src/test/regress/sql/select_views.sql
index e453765e99..dd1837f797 100644
--- a/src/test/regress/sql/select_views.sql
+++ b/src/test/regress/sql/select_views.sql
@@ -1,8 +1,8 @@
 --
--- VIEW queries
---
--- test the views defined in create.source
+-- SELECT_VIEWS
+-- test the views defined in CREATE_VIEWS
 --
+
 SELECT * FROM street;
 
 SELECT name, #thepath FROM iexit ORDER BY 1, 2;
diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql
index a227c048ac..898c9d32d6 100644
--- a/src/test/regress/sql/subselect.sql
+++ b/src/test/regress/sql/subselect.sql
@@ -1,5 +1,5 @@
 --
--- Subselects
+-- SUBSELECT
 --
 
 SELECT 1 AS one WHERE 1 IN (SELECT 1);
diff --git a/src/test/regress/sql/temp.sql b/src/test/regress/sql/temp.sql
index 066ce50eb0..8033405ff9 100644
--- a/src/test/regress/sql/temp.sql
+++ b/src/test/regress/sql/temp.sql
@@ -1,4 +1,5 @@
 --
+-- TEMP
 -- Test temp relations and indexes
 --
 
@@ -45,3 +46,4 @@ CREATE TEMP TABLE temptest(col int);
 \c regression
 
 SELECT * FROM temptest;
+
diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql
index 7f8e9c7c0c..6a84c6365c 100644
--- a/src/test/regress/sql/transactions.sql
+++ b/src/test/regress/sql/transactions.sql
@@ -1,6 +1,7 @@
 --
--- transaction blocks
+-- TRANSACTIONS
 --
+
 BEGIN;
 
 SELECT * 
diff --git a/src/test/regress/sql/union.sql b/src/test/regress/sql/union.sql
index 781de87a86..22ea190f2e 100644
--- a/src/test/regress/sql/union.sql
+++ b/src/test/regress/sql/union.sql
@@ -1,5 +1,5 @@
 --
--- union.sql
+-- UNION
 --
 
 -- Simple UNION constructs