Make tests match with modified error messages.

diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out
index cbd2d1013aed30abc5d252f4813c568595b3de1d..8e168e6cba61e1057a04021649ebe465493943fe 100644 (file)
--- a/src/test/regress/expected/errors.out
+++ b/src/test/regress/expected/errors.out
@@ -2,7 +2,6 @@ QUERY: select 1
 select
 select * from nonesuch;
 WARN:parser: parse error at or near "select"
-
 QUERY: select nonesuch from pg_database;
 WARN:attribute "nonesuch" not found
 QUERY: select * from pg_database where nonesuch = pg_database.datname;
@@ -11,22 +10,18 @@ QUERY: select * from pg_database where pg_database.datname = nonesuch;
 WARN:attribute "nonesuch" not found
 QUERY: select distinct on foobar from pg_database;
 WARN:parser: parse error at or near "from"
-
 QUERY: select distinct on foobar * from pg_database;
 WARN:The field specified in the UNIQUE ON clause is not in the targetlist
 QUERY: delete from;
 WARN:parser: parse error at or near ";"
-
 QUERY: delete from nonesuch;
 WARN:nonesuch: Table does not exist.
 QUERY: drop table;
 WARN:parser: parse error at or near ";"
-
 QUERY: drop table nonesuch;
 WARN:Relation nonesuch Does Not Exist!
 QUERY: alter table rename;
 WARN:parser: parse error at or near "rename"
-
 QUERY: alter table nonesuch rename to newnonesuch;
 WARN:renamerel: relation "nonesuch" does not exist
 QUERY: alter table nonesuch rename to stud_emp;
@@ -85,62 +80,46 @@ QUERY: create aggregate newcnt1 (sfunc2 = int4inc,
 WARN:AggregateCreate: transition function 2 MUST have an initial value
 QUERY: drop index;
 WARN:parser: parse error at or near ";"
-
 QUERY: drop index 314159;
 WARN:parser: parse error at or near "314159"
-
 QUERY: drop index nonesuch;
 WARN:index "nonesuch" nonexistent
 QUERY: drop aggregate;
 WARN:parser: parse error at or near ";"
-
 QUERY: drop aggregate 314159;
 WARN:parser: parse error at or near "314159"
-
 QUERY: drop aggregate nonesuch;
 WARN:parser: parse error at or near ";"
-
 QUERY: drop aggregate newcnt1;
 WARN:parser: parse error at or near ";"
-
 QUERY: drop aggregate newcnt nonesuch;
 WARN:RemoveAggregate: type 'nonesuch' does not exist
 QUERY: drop aggregate newcnt float4;
 WARN:RemoveAggregate: aggregate 'newcnt' for 'float4' does not exist
 QUERY: drop function ();
 WARN:parser: parse error at or near "("
-
 QUERY: drop function 314159();
 WARN:parser: parse error at or near "314159"
-
 QUERY: drop function nonesuch();
 WARN:RemoveFunction: function nonesuch() does not exist
 QUERY: drop type;
 WARN:parser: parse error at or near ";"
-
 QUERY: drop type 314159;
 WARN:parser: parse error at or near "314159"
-
 QUERY: drop type nonesuch;
 WARN:RemoveType: type 'nonesuch' does not exist
 QUERY: drop operator;
 WARN:parser: parse error at or near ";"
-
 QUERY: drop operator equals;
 WARN:parser: parse error at or near "equals"
-
 QUERY: drop operator ===;
 WARN:parser: parse error at or near ";"
-
 QUERY: drop operator int4, int4;
 WARN:parser: parse error at or near "int4"
-
 QUERY: drop operator (int4, int4);
 WARN:parser: parse error at or near "("
-
 QUERY: drop operator === ();
 WARN:parser: parse error at or near ")"
-
 QUERY: drop operator === (int4);
 WARN:parser: argument type missing (use NONE for unary operators)
 QUERY: drop operator === (int4, int4);
@@ -149,28 +128,21 @@ QUERY: drop operator = (nonesuch);
 WARN:parser: argument type missing (use NONE for unary operators)
 QUERY: drop operator = ( , int4);
 WARN:parser: parse error at or near ","
-
 QUERY: drop operator = (nonesuch, int4);
 WARN:RemoveOperator: type 'nonesuch' does not exist
 QUERY: drop operator = (int4, nonesuch);
 WARN:RemoveOperator: type 'nonesuch' does not exist
 QUERY: drop operator = (int4, );
 WARN:parser: parse error at or near ")"
-
 QUERY: drop rule;
 WARN:parser: parse error at or near ";"
-
 QUERY: drop rule 314159;
 WARN:parser: parse error at or near "314159"
-
 QUERY: drop rule nonesuch;
 WARN:RewriteGetRuleEventRel: rule "nonesuch" not found
 QUERY: drop tuple rule nonesuch;
 WARN:parser: parse error at or near "tuple"
-
 QUERY: drop instance rule nonesuch;
 WARN:parser: parse error at or near "instance"
-
 QUERY: drop rewrite rule nonesuch;
 WARN:parser: parse error at or near "rewrite"
-

diff --git a/src/test/regress/expected/float4.out b/src/test/regress/expected/float4.out
index 92cfe073af71e8c9dbdddb35ce05e88c268b0b9c..85f09e5aa843860aac5ac00de0ea9915b7fe54d6 100644 (file)
--- a/src/test/regress/expected/float4.out
+++ b/src/test/regress/expected/float4.out
@@ -5,17 +5,13 @@ QUERY: INSERT INTO FLOAT4_TBL(f1) VALUES ('-34.84');
 QUERY: INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e+20');
 QUERY: INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20');
 QUERY: INSERT INTO FLOAT4_TBL(f1) VALUES ('10e40');
-WARN:  Bad float4 input format -- overflow
-
+WARN:Bad float4 input format -- overflow
 QUERY: INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e40');
-WARN:  Bad float4 input format -- overflow
-
+WARN:Bad float4 input format -- overflow
 QUERY: INSERT INTO FLOAT4_TBL(f1) VALUES ('10e-40');
-WARN:  Bad float4 input format -- underflow
-
+WARN:Bad float4 input format -- underflow
 QUERY: INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e-40');
-WARN:  Bad float4 input format -- underflow
-
+WARN:Bad float4 input format -- underflow
 QUERY: SELECT '' AS five, FLOAT4_TBL.*;
 five|f1         
 ----+-----------
@@ -112,7 +108,7 @@ three|f1         |x
 (3 rows)
 
 QUERY: SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f;
-WARN:float4div:  divide by 0.0 error
+WARN:float4div: divide by zero error
 QUERY: SELECT '' AS five, FLOAT4_TBL.*;
 five|f1         
 ----+-----------

diff --git a/src/test/regress/expected/float8.out b/src/test/regress/expected/float8.out
index 533d9a47e5833c634440d860574c718143cc4a6e..b14cc49dd185f01f048c31414e29c6e9ceb45e2f 100644 (file)
--- a/src/test/regress/expected/float8.out
+++ b/src/test/regress/expected/float8.out
@@ -5,17 +5,13 @@ QUERY: INSERT INTO FLOAT8_TBL(f1) VALUES ('-34.84');
 QUERY: INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e+200');
 QUERY: INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e-200');
 QUERY: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400');
-WARN:  Bad float8 input format
-
+WARN:Bad float8 input format '10e400'
 QUERY: INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400');
-WARN:  Bad float8 input format
-
+WARN:Bad float8 input format '-10e400'
 QUERY: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e-400');
-WARN:  Bad float8 input format
-
+WARN:Bad float8 input format '10e-400'
 QUERY: INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e-400');
-WARN:  Bad float8 input format
-
+WARN:Bad float8 input format '-10e-400'
 QUERY: SELECT '' AS five, FLOAT8_TBL.*;
 five|f1                  
 ----+--------------------
@@ -199,13 +195,11 @@ QUERY: UPDATE FLOAT8_TBL
    SET f1 = FLOAT8_TBL.f1 * '-1'
    WHERE FLOAT8_TBL.f1 > '0.0';
 QUERY: SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f;
-WARN:  Bad float8 input format -- overflow
-
+WARN:Bad float8 input format -- overflow
 QUERY: SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
-WARN:pow() returned a floating point out of the range
-
+WARN:pow() result is out of range
 QUERY: SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 = '0.0' ;
-WARN:can't take log of 0!
+WARN:can't take log of zero
 QUERY: SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 < '0.0' ;
 WARN:can't take log of a negative number
 QUERY: SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f;
@@ -219,7 +213,7 @@ bad|            ?column?
 (5 rows)
 
 QUERY: SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
-WARN:float8div:  divide by 0.0 error
+WARN:float8div: divide by zero error
 QUERY: SELECT '' AS five, FLOAT8_TBL.*;
 five|f1                   
 ----+---------------------