Modify regression tests to match new error reporting format from Gavin.

2 files changed, 28 insertions, 28 deletions

diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out
index 4eabfd129bd..3941cc47ad4 100644
--- a/src/test/regress/expected/errors.out
+++ b/src/test/regress/expected/errors.out
@@ -19,7 +19,7 @@ select 1
 select
 -- no such relation 
 select * from nonesuch;
-ERROR:  parser: parse error at or near "select"
+ERROR:  parser: parse error at or near "select" at character 10
 -- bad name in target list
 select nonesuch from pg_database;
 ERROR:  Attribute "nonesuch" not found
@@ -31,7 +31,7 @@ select * from pg_database where pg_database.datname = nonesuch;
 ERROR:  Attribute "nonesuch" not found
 -- bad select distinct on syntax, distinct attribute missing
 select distinct on (foobar) from pg_database;
-ERROR:  parser: parse error at or near "from"
+ERROR:  parser: parse error at or near "from" at character 29
 -- bad select distinct on syntax, distinct attribute not in target list
 select distinct on (foobar) * from pg_database;
 ERROR:  Attribute "foobar" not found
@@ -40,7 +40,7 @@ ERROR:  Attribute "foobar" not found
  
 -- missing relation name (this had better not wildcard!) 
 delete from;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 12
 -- no such relation 
 delete from nonesuch;
 ERROR:  Relation "nonesuch" does not exist
@@ -49,7 +49,7 @@ ERROR:  Relation "nonesuch" does not exist
  
 -- missing relation name (this had better not wildcard!) 
 drop table;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 11
 -- no such relation 
 drop table nonesuch;
 ERROR:  table "nonesuch" does not exist
@@ -59,7 +59,7 @@ ERROR:  table "nonesuch" does not exist
 -- relation renaming 
 -- missing relation name 
 alter table rename;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 19
 -- no such relation 
 alter table nonesuch rename to newnonesuch;
 ERROR:  Relation "nonesuch" does not exist
@@ -113,10 +113,10 @@ ERROR:  Define: "basetype" unspecified
  
 -- missing index name 
 drop index;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 11
 -- bad index name 
 drop index 314159;
-ERROR:  parser: parse error at or near "314159"
+ERROR:  parser: parse error at or near "314159" at character 12
 -- no such index 
 drop index nonesuch;
 ERROR:  index "nonesuch" does not exist
@@ -125,13 +125,13 @@ ERROR:  index "nonesuch" does not exist
  
 -- missing aggregate name 
 drop aggregate;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 15
 -- missing aggregate type
 drop aggregate newcnt1;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 23
 -- bad aggregate name 
 drop aggregate 314159 (int);
-ERROR:  parser: parse error at or near "314159"
+ERROR:  parser: parse error at or near "314159" at character 16
 -- bad aggregate type
 drop aggregate newcnt (nonesuch);
 ERROR:  Type "nonesuch" does not exist
@@ -146,10 +146,10 @@ ERROR:  RemoveAggregate: aggregate newcnt(real) does not exist
  
 -- missing function name 
 drop function ();
-ERROR:  parser: parse error at or near "("
+ERROR:  parser: parse error at or near "(" at character 15
 -- bad function name 
 drop function 314159();
-ERROR:  parser: parse error at or near "314159"
+ERROR:  parser: parse error at or near "314159" at character 15
 -- no such function 
 drop function nonesuch();
 ERROR:  RemoveFunction: function nonesuch() does not exist
@@ -158,10 +158,10 @@ ERROR:  RemoveFunction: function nonesuch() does not exist
  
 -- missing type name 
 drop type;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 10
 -- bad type name 
 drop type 314159;
-ERROR:  parser: parse error at or near "314159"
+ERROR:  parser: parse error at or near "314159" at character 11
 -- no such type 
 drop type nonesuch;
 ERROR:  Type "nonesuch" does not exist
@@ -170,22 +170,22 @@ ERROR:  Type "nonesuch" does not exist
  
 -- missing everything 
 drop operator;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 14
 -- bad operator name 
 drop operator equals;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 21
 -- missing type list 
 drop operator ===;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 18
 -- missing parentheses 
 drop operator int4, int4;
-ERROR:  parser: parse error at or near ","
+ERROR:  parser: parse error at or near "," at character 19
 -- missing operator name 
 drop operator (int4, int4);
-ERROR:  parser: parse error at or near "("
+ERROR:  parser: parse error at or near "(" at character 15
 -- missing type list contents 
 drop operator === ();
-ERROR:  parser: parse error at or near ")"
+ERROR:  parser: parse error at or near ")" at character 20
 -- no such operator 
 drop operator === (int4);
 ERROR:  parser: argument type missing (use NONE for unary operators)
@@ -197,7 +197,7 @@ drop operator = (nonesuch);
 ERROR:  parser: argument type missing (use NONE for unary operators)
 -- no such type1 
 drop operator = ( , int4);
-ERROR:  parser: parse error at or near ","
+ERROR:  parser: parse error at or near "," at character 19
 -- no such type1 
 drop operator = (nonesuch, int4);
 ERROR:  Type "nonesuch" does not exist
@@ -206,25 +206,25 @@ drop operator = (int4, nonesuch);
 ERROR:  Type "nonesuch" does not exist
 -- no such type2 
 drop operator = (int4, );
-ERROR:  parser: parse error at or near ")"
+ERROR:  parser: parse error at or near ")" at character 24
 --
 -- DROP RULE
  
 -- missing rule name 
 drop rule;
-ERROR:  parser: parse error at or near ";"
+ERROR:  parser: parse error at or near ";" at character 10
 -- bad rule name 
 drop rule 314159;
-ERROR:  parser: parse error at or near "314159"
+ERROR:  parser: parse error at or near "314159" at character 11
 -- no such rule 
 drop rule nonesuch on noplace;
 ERROR:  Relation "noplace" does not exist
 -- bad keyword 
 drop tuple rule nonesuch;
-ERROR:  parser: parse error at or near "tuple"
+ERROR:  parser: parse error at or near "tuple" at character 6
 -- no such rule 
 drop instance rule nonesuch on noplace;
-ERROR:  parser: parse error at or near "instance"
+ERROR:  parser: parse error at or near "instance" at character 6
 -- no such rule 
 drop rewrite rule nonesuch;
-ERROR:  parser: parse error at or near "rewrite"
+ERROR:  parser: parse error at or near "rewrite" at character 6
diff --git a/src/test/regress/expected/strings.out b/src/test/regress/expected/strings.out
index 680a76c0bd5..b275df2ff86 100644
--- a/src/test/regress/expected/strings.out
+++ b/src/test/regress/expected/strings.out
@@ -18,7 +18,7 @@ SELECT 'first line'
 ' - next line' /* this comment is not allowed here */
 ' - third line'
 	AS "Illegal comment within continuation";
-ERROR:  parser: parse error at or near "' - third line'"
+ERROR:  parser: parse error at or near "' - third line'" at character 89
 --
 -- test conversions between various string types
 -- E021-10 implicit casting among the character data types