Adjust tests to reflect removal of time travel.

Add tests for strings and varchar.

7 files changed, 78 insertions, 21 deletions

diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index 9394ec283d..5765560ea7 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -70,7 +70,7 @@ DROP TABLE temp;
 -- the wolf bug - schema mods caused inconsistent row descriptors 
 CREATE TABLE temp (
 	initial 	int4
-) ARCHIVE = light;
+);
 
 ALTER TABLE temp ADD COLUMN a int4;
 
@@ -132,7 +132,7 @@ INSERT INTO temp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
 	'(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["current" "infinity"]',
 	'1/3', '1,char16', '{1.0,2.0,3.0,4.0}', '{1.0,2.0,3.0,4.0}', '{1,2,3,4}');
 
-SELECT * FROM temp[,];
+SELECT * FROM temp;
 
 DROP TABLE temp;
 
diff --git a/src/test/regress/sql/boolean.sql b/src/test/regress/sql/boolean.sql
index 9aa7f343a3..4f1cef2de4 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.4 1997/10/25 06:02:33 thomas Exp $
+-- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.5 1997/12/01 02:45:59 thomas Exp $
 --
 
 --
@@ -72,12 +72,11 @@ INSERT INTO BOOLTBL2 (f1) VALUES ('False'::bool);
 
 INSERT INTO BOOLTBL2 (f1) VALUES ('FALSE'::bool);
 
--- this is now an invalid expression
--- pre-v6.3 this evaluated to false - thomas 1997-10-23
+-- This is now an invalid expression
+-- For pre-v6.3 this evaluated to false - thomas 1997-10-23
 INSERT INTO BOOLTBL2 (f1) 
    VALUES ('XXX'::bool);  
 
-
 -- BOOLTBL2 should be full of false's at this point 
 SELECT '' AS f_4, BOOLTBL2.*;
 
@@ -98,6 +97,33 @@ SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.*
    WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool
    ORDER BY BOOLTBL1.f1, BOOLTBL2.f1;
 
+--
+-- SQL92 syntax - thomas 1997-11-30
+--
+
+SELECT '' AS "True", BOOLTBL1.* 
+   FROM BOOLTBL1
+   WHERE f1 IS TRUE;
+
+SELECT '' AS "Not False", BOOLTBL1.* 
+   FROM BOOLTBL1
+   WHERE f1 IS NOT FALSE;
+
+SELECT '' AS "False", BOOLTBL1.* 
+   FROM BOOLTBL1
+   WHERE f1 IS FALSE;
+
+SELECT '' AS "Not True", BOOLTBL1.* 
+   FROM BOOLTBL1
+   WHERE f1 IS NOT TRUE;
+
+--
+-- Clean up
+-- Many tables are retained by the regression test, but these do not seem
+--  particularly useful so just get rid of them for now.
+--  - thomas 1997-11-30
+--
+
 DROP TABLE  BOOLTBL1;
 
 DROP TABLE  BOOLTBL2;
diff --git a/src/test/regress/sql/char.sql b/src/test/regress/sql/char.sql
index 8dd7bdc22d..49a13a0fb9 100644
--- a/src/test/regress/sql/char.sql
+++ b/src/test/regress/sql/char.sql
@@ -3,6 +3,17 @@
 -- all inputs are SILENTLY truncated at 1 character
 --
 
+-- fixed-length by value
+-- internally passed by value if <= 4 bytes in storage
+-- Not sure why this is a really useful test,
+--  but this test has been here forever. - thomas 1997-11-30
+
+SELECT 'c'::char = 'c'::char AS true;
+
+--
+-- Build a table for testing
+--
+
 CREATE TABLE CHAR_TBL(f1 char);
 
 INSERT INTO CHAR_TBL (f1) VALUES ('a');
@@ -51,3 +62,16 @@ SELECT '' AS two, c.*
 
 DROP TABLE CHAR_TBL;
 
+--
+-- Now test longer arrays of char
+--
+
+CREATE TABLE CHAR_TBL(f1 char(4));
+
+INSERT INTO CHAR_TBL (f1) VALUES ('a');
+INSERT INTO CHAR_TBL (f1) VALUES ('ab');
+INSERT INTO CHAR_TBL (f1) VALUES ('abcd');
+INSERT INTO CHAR_TBL (f1) VALUES ('abcde');
+
+SELECT '' AS four, CHAR_TBL.*;
+
diff --git a/src/test/regress/sql/char16.sql b/src/test/regress/sql/char16.sql
index d1d5ea1d47..349da10460 100644
--- a/src/test/regress/sql/char16.sql
+++ b/src/test/regress/sql/char16.sql
@@ -3,6 +3,15 @@
 -- all inputs are silently truncated at 16 characters
 --
 
+-- fixed-length by reference
+SELECT 'char 16 string'::char16 = 'char 16 string'::char16 AS "True";
+
+SELECT 'char 16 string'::char16 = 'char 16 string '::char16 AS "False";
+
+--
+--
+--
+
 CREATE TABLE CHAR16_TBL(f1 char16);
 
 INSERT INTO CHAR16_TBL(f1) VALUES ('ABCDEFGHIJKLMNOP');
diff --git a/src/test/regress/sql/select_views.sql b/src/test/regress/sql/select_views.sql
index 96db3362db..c86094016a 100644
--- a/src/test/regress/sql/select_views.sql
+++ b/src/test/regress/sql/select_views.sql
@@ -3,9 +3,10 @@
 --
 -- test the views defined in create.source
 --
-SELECT * from street;
+SELECT * FROM street;
 
-SELECT * from iexit;
+SELECT * FROM iexit
+	ORDER BY 1, 2;
 
-SELECT * from toyemp where name='sharon';
+SELECT * FROM toyemp WHERE name = 'sharon';
 
diff --git a/src/test/regress/sql/tests b/src/test/regress/sql/tests
index 0e47432c8e..f9bd529aa2 100644
--- a/src/test/regress/sql/tests
+++ b/src/test/regress/sql/tests
@@ -1,10 +1,12 @@
 boolean
 char
-char16
 char2
 char4
 char8
+char16
+varchar
 text
+strings
 int2
 int4
 oid
@@ -56,5 +58,4 @@ btree_index
 hash_index
 select_views
 alter_table
-purge
 portals_p2
diff --git a/src/test/regress/sql/text.sql b/src/test/regress/sql/text.sql
index d1c9a3e883..fb9daf4fd5 100644
--- a/src/test/regress/sql/text.sql
+++ b/src/test/regress/sql/text.sql
@@ -1,17 +1,13 @@
 -- *************testing built-in type text  ****************
 
---
--- adt operators in the target list
---
--- fixed-length by reference 
-SELECT 'char 16 string'::char16 = 'char 16 string '::char16 AS false;
-
--- fixed-length by value 
-SELECT 'c'::char = 'c'::char AS true;
-
--- variable-length 
 SELECT 'this is a text string'::text = 'this is a text string'::text AS true;
 
 SELECT 'this is a text string'::text = 'this is a text strin'::text AS false;
 
+CREATE TABLE TEXT_TBL (f1 text);
+
+INSERT INTO TEXT_TBL VALUES ('doh!');
+INSERT INTO TEXT_TBL VALUES ('hi de ho neighbor');
+
+SELECT '' AS two, * FROM TEXT_TBL;