mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove comments psql was putting in output, typo's.

Browse Source 
psql now returns error from queries and errors files, so ignore return code.
This commit is contained in:
Bruce Momjian 1996-11-14 16:09:28 +00:00
parent 0365c51e30
commit fdcf5ff79c
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/regress/expected.input
View File

@ -416,15 +416,15 @@ QUERY: CREATE OPERATOR <% (
commutator = >=% commutator = >=%
); );
QUERY: CREATE OPERATOR @#@ ( QUERY: CREATE OPERATOR @#@ (
rightarg = int4, -- left unary rightarg = int4,
procedure = int4fac procedure = int4fac
); );
QUERY: CREATE OPERATOR #@# ( QUERY: CREATE OPERATOR #@# (
leftarg = int4, -- right unary leftarg = int4,
procedure = int4fac procedure = int4fac
); );
QUERY: CREATE OPERATOR #%# ( QUERY: CREATE OPERATOR #%# (
leftarg = int4, -- right unary leftarg = int4,
procedure = int4fac procedure = int4fac
); );
QUERY: CREATE VIEW street AS QUERY: CREATE VIEW street AS
@ -799,7 +799,7 @@ six|f1
(6 rows) (6 rows)
QUERY: SELECT '' AS five, ABSTIME_TBL.* QUERY: SELECT '' AS five, ABSTIME_TBL.*
WHERE (ABSTIME_TBL.f1 + '@ 3 year'::reltime) -- +3 years WHERE (ABSTIME_TBL.f1 + '@ 3 year'::reltime)
< 'Jan 14 14:00:00 1977'::abstime; < 'Jan 14 14:00:00 1977'::abstime;
five|f1 five|f1
----+---------------------------- ----+----------------------------
@ -811,7 +811,7 @@ five|f1
(5 rows) (5 rows)
QUERY: SELECT '' AS five, ABSTIME_TBL.* QUERY: SELECT '' AS five, ABSTIME_TBL.*
WHERE (ABSTIME_TBL.f1 + '@ 3 year ago'::reltime) -- -3 years WHERE (ABSTIME_TBL.f1 + '@ 3 year ago'::reltime)
< 'Jan 14 14:00:00 1971'::abstime; < 'Jan 14 14:00:00 1971'::abstime;
five|f1 five|f1
----+---------------------------- ----+----------------------------
@ -823,7 +823,7 @@ five|f1
(5 rows) (5 rows)
QUERY: SELECT '' AS five, ABSTIME_TBL.* QUERY: SELECT '' AS five, ABSTIME_TBL.*
WHERE (ABSTIME_TBL.f1 - '@ 3 year'::reltime) -- -(+3) years WHERE (ABSTIME_TBL.f1 - '@ 3 year'::reltime)
< 'Jan 14 14:00:00 1971'::abstime; < 'Jan 14 14:00:00 1971'::abstime;
five|f1 five|f1
----+---------------------------- ----+----------------------------
@ -835,7 +835,7 @@ five|f1
(5 rows) (5 rows)
QUERY: SELECT '' AS five, ABSTIME_TBL.* QUERY: SELECT '' AS five, ABSTIME_TBL.*
WHERE (ABSTIME_TBL.f1 - '@ 3 year ago'::reltime) -- -(-3) years WHERE (ABSTIME_TBL.f1 - '@ 3 year ago'::reltime)
< 'Jan 14 14:00:00 1977'::abstime; < 'Jan 14 14:00:00 1977'::abstime;
five|f1 five|f1
----+---------------------------- ----+----------------------------

6
src/test/regress/queries.source
View File

@ -1,7 +1,7 @@
-- --
-- queries.source -- queries.source
-- --
-- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.3 1996/10/30 02:02:39 momjian Exp $ -- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.4 1996/11/14 16:09:26 momjian Exp $
-- --
-- The comments that contain sequences of UNIX commands generate the -- The comments that contain sequences of UNIX commands generate the
-- desired output for the POSTQUEL statement(s). -- desired output for the POSTQUEL statement(s).
@ -837,9 +837,9 @@ SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f;
SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f; SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
SELECT '' AS bad, ; (f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ; SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
SELECT '' AS bad, ; (f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ; SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f; SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f;

12
src/test/regress/regress.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.2 1996/10/30 02:02:41 momjian Exp $ # $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.3 1996/11/14 16:09:28 momjian Exp $
# #
if [ -d ./obj ]; then if [ -d ./obj ]; then
cd ./obj cd ./obj
@ -28,17 +28,11 @@ fi
echo =============== running regression queries ... ================= echo =============== running regression queries ... =================
$FRONTEND regression < queries.sql $FRONTEND regression < queries.sql
if [ $? -ne 0 ]; then # this will generate error result code
echo the queries script causes an error
exit 1
fi
echo =============== running error queries ... ================= echo =============== running error queries ... =================
$FRONTEND regression < errors.sql $FRONTEND regression < errors.sql
if [ $? -ne 0 ]; then # this will generate error result code
echo the errors script has an unanticipated problem
exit 1
fi
#set this to 1 to avoid clearing the database #set this to 1 to avoid clearing the database
debug=0 debug=0