contrib/cube & contrib/seg regression fixes - Mailing list pgsql-patches

The attached fixes regression test failures in contrib/cube & contrib/seg.
Both had error message wording that changed.

Please apply.

Thanks,

Joe
Index: contrib/cube/expected/cube.out
===================================================================
RCS file: /opt/src/cvs/pgsql-server/contrib/cube/expected/cube.out,v
retrieving revision 1.5
diff -c -r1.5 cube.out
*** contrib/cube/expected/cube.out    12 Sep 2002 00:26:00 -0000    1.5
--- contrib/cube/expected/cube.out    14 Sep 2002 02:49:15 -0000
***************
*** 258,303 ****
  SELECT ''::cube AS cube;
  ERROR:  cube_in: can't parse an empty string
  SELECT 'ABC'::cube AS cube;
! ERROR:  parse error, expecting `FLOAT' or `O_PAREN' or `O_BRACKET' at or before position 1, character ('A', \101),
input:'ABC' 

  SELECT '()'::cube AS cube;
! ERROR:  parse error, expecting `FLOAT' at or before position 2, character (')', \051), input: '()'

  SELECT '[]'::cube AS cube;
! ERROR:  parse error, expecting `O_PAREN' at or before position 2, character (']', \135), input: '[]'

  SELECT '[()]'::cube AS cube;
! ERROR:  parse error, expecting `FLOAT' at or before position 3, character (')', \051), input: '[()]'

  SELECT '[(1)]'::cube AS cube;
! ERROR:  parse error, expecting `COMMA' at or before position 5, character (']', \135), input: '[(1)]'

  SELECT '[(1),]'::cube AS cube;
! ERROR:  parse error, expecting `O_PAREN' at or before position 6, character (']', \135), input: '[(1),]'

  SELECT '[(1),2]'::cube AS cube;
! ERROR:  parse error, expecting `O_PAREN' at or before position 7, character (']', \135), input: '[(1),2]'

  SELECT '[(1),(2),(3)]'::cube AS cube;
! ERROR:  parse error, expecting `C_BRACKET' at or before position 9, character (',', \054), input: '[(1),(2),(3)]'

  SELECT '1,'::cube AS cube;
! ERROR:  parse error, expecting `FLOAT' at or before position 2, character (',', \054), input: '1,'

  SELECT '1,2,'::cube AS cube;
! ERROR:  parse error, expecting `FLOAT' at or before position 4, character (',', \054), input: '1,2,'

  SELECT '1,,2'::cube AS cube;
! ERROR:  parse error, expecting `FLOAT' at or before position 3, character (',', \054), input: '1,,2'

  SELECT '(1,)'::cube AS cube;
! ERROR:  parse error, expecting `FLOAT' at or before position 4, character (')', \051), input: '(1,)'

  SELECT '(1,2,)'::cube AS cube;
! ERROR:  parse error, expecting `FLOAT' at or before position 6, character (')', \051), input: '(1,2,)'

  SELECT '(1,,2)'::cube AS cube;
! ERROR:  parse error, expecting `FLOAT' at or before position 4, character (',', \054), input: '(1,,2)'

  -- invalid input: semantic errors and trailing garbage
  SELECT '[(1),(2)],'::cube AS cube; -- 0
--- 258,303 ----
  SELECT ''::cube AS cube;
  ERROR:  cube_in: can't parse an empty string
  SELECT 'ABC'::cube AS cube;
! ERROR:  parse error, unexpected $undefined., expecting FLOAT or O_PAREN or O_BRACKET at or before position 1,
character('A', \101), input: 'ABC' 

  SELECT '()'::cube AS cube;
! ERROR:  parse error, unexpected C_PAREN, expecting FLOAT at or before position 2, character (')', \051), input: '()'

  SELECT '[]'::cube AS cube;
! ERROR:  parse error, unexpected C_BRACKET, expecting O_PAREN at or before position 2, character (']', \135), input:
'[]'

  SELECT '[()]'::cube AS cube;
! ERROR:  parse error, unexpected C_PAREN, expecting FLOAT at or before position 3, character (')', \051), input:
'[()]'

  SELECT '[(1)]'::cube AS cube;
! ERROR:  parse error, unexpected C_BRACKET, expecting COMMA at or before position 5, character (']', \135), input:
'[(1)]'

  SELECT '[(1),]'::cube AS cube;
! ERROR:  parse error, unexpected C_BRACKET, expecting O_PAREN at or before position 6, character (']', \135), input:
'[(1),]'

  SELECT '[(1),2]'::cube AS cube;
! ERROR:  parse error, unexpected FLOAT, expecting O_PAREN at or before position 7, character (']', \135), input:
'[(1),2]'

  SELECT '[(1),(2),(3)]'::cube AS cube;
! ERROR:  parse error, unexpected COMMA, expecting C_BRACKET at or before position 9, character (',', \054), input:
'[(1),(2),(3)]'

  SELECT '1,'::cube AS cube;
! ERROR:  parse error, unexpected $, expecting FLOAT at or before position 2, character (',', \054), input: '1,'

  SELECT '1,2,'::cube AS cube;
! ERROR:  parse error, unexpected $, expecting FLOAT at or before position 4, character (',', \054), input: '1,2,'

  SELECT '1,,2'::cube AS cube;
! ERROR:  parse error, unexpected COMMA, expecting FLOAT at or before position 3, character (',', \054), input: '1,,2'

  SELECT '(1,)'::cube AS cube;
! ERROR:  parse error, unexpected C_PAREN, expecting FLOAT at or before position 4, character (')', \051), input:
'(1,)'

  SELECT '(1,2,)'::cube AS cube;
! ERROR:  parse error, unexpected C_PAREN, expecting FLOAT at or before position 6, character (')', \051), input:
'(1,2,)'

  SELECT '(1,,2)'::cube AS cube;
! ERROR:  parse error, unexpected COMMA, expecting FLOAT at or before position 4, character (',', \054), input:
'(1,,2)'

  -- invalid input: semantic errors and trailing garbage
  SELECT '[(1),(2)],'::cube AS cube; -- 0
Index: contrib/seg/expected/seg.out
===================================================================
RCS file: /opt/src/cvs/pgsql-server/contrib/seg/expected/seg.out,v
retrieving revision 1.2
diff -c -r1.2 seg.out
*** contrib/seg/expected/seg.out    23 Aug 2002 00:04:52 -0000    1.2
--- contrib/seg/expected/seg.out    14 Sep 2002 02:49:30 -0000
***************
*** 395,419 ****
  SELECT ''::seg AS seg;
  ERROR:  seg_in: can't parse an empty string
  SELECT 'ABC'::seg AS seg;
! ERROR:  parse error, expecting `FLOAT' or `RANGE' or `EXTENSION' at or near position 1, character ('A', \101), input:
'ABC'

  SELECT '1ABC'::seg AS seg;
! ERROR:  expecting end of input at or near position 2, character ('A', \101), input: '1ABC'

  SELECT '1.'::seg AS seg;
! ERROR:  expecting end of input at or near position 2, character ('.', \056), input: '1.'

  SELECT '1.....'::seg AS seg;
! ERROR:  expecting end of input at or near position 6, character ('.', \056), input: '1.....'

  SELECT '.1'::seg AS seg;
! ERROR:  parse error, expecting `FLOAT' or `RANGE' or `EXTENSION' at or near position 2, character ('1', \061), input:
'.1'

  SELECT '1..2.'::seg AS seg;
! ERROR:  expecting end of input at or near position 5, character ('.', \056), input: '1..2.'

  SELECT '1 e7'::seg AS seg;
! ERROR:  expecting end of input at or near position 3, character ('e', \145), input: '1 e7'

  SELECT '1e700'::seg AS seg;
  ERROR:  numeric value 1e700 unrepresentable
--- 395,419 ----
  SELECT ''::seg AS seg;
  ERROR:  seg_in: can't parse an empty string
  SELECT 'ABC'::seg AS seg;
! ERROR:  parse error, unexpected $undefined., expecting FLOAT or RANGE or EXTENSION at or near position 1, character
('A',\101), input: 'ABC' 

  SELECT '1ABC'::seg AS seg;
! ERROR:  parse error, unexpected $undefined., expecting $ at or near position 2, character ('A', \101), input: '1ABC'

  SELECT '1.'::seg AS seg;
! ERROR:  parse error, unexpected $undefined., expecting $ at or near position 2, character ('.', \056), input: '1.'

  SELECT '1.....'::seg AS seg;
! ERROR:  parse error, unexpected RANGE, expecting $ at or near position 6, character ('.', \056), input: '1.....'

  SELECT '.1'::seg AS seg;
! ERROR:  parse error, unexpected $undefined., expecting FLOAT or RANGE or EXTENSION at or near position 2, character
('1',\061), input: '.1' 

  SELECT '1..2.'::seg AS seg;
! ERROR:  parse error, unexpected $undefined., expecting $ at or near position 5, character ('.', \056), input: '1..2.'

  SELECT '1 e7'::seg AS seg;
! ERROR:  parse error, unexpected $undefined., expecting $ at or near position 3, character ('e', \145), input: '1 e7'

  SELECT '1e700'::seg AS seg;
  ERROR:  numeric value 1e700 unrepresentable