Skip to content

Commit 7ab5c5b

Browse files
tglsfdctglsfdc
committed
Fix regression error messages for platforms Peter doesn't use.
1 parent d332f7f commit 7ab5c5b

11 files changed

+40
-40
lines changed

‎src/test/regress/expected/abstime-solaris-1947.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'May 10, 1947 23:59:12');
2929
-- what happens if we specify slightly misformatted abstime?
3030
INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00');
3131
ERROR: date/time field value out of range: "Feb 35, 1946 10:00:00"
32-
HINT: Perhaps you need a different DateStyle setting.
32+
HINT: Perhaps you need a different "datestyle" setting.
3333
INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10');
3434
ERROR: date/time field value out of range: "Feb 28, 1984 25:08:10"
3535
-- badly formatted abstimes: these should result in invalid abstimes
3636
INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format');
37-
ERROR: invalid input syntax for abstime: "bad date format"
37+
ERROR: invalid input syntax for type abstime: "bad date format"
3838
INSERT INTO ABSTIME_TBL (f1) VALUES ('Jun 10, 1843');
3939
-- test abstime operators
4040
SELECT '' AS eight, ABSTIME_TBL.*;

‎src/test/regress/expected/float4-exp-three-digits.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e+20');
99
INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20');
1010
-- test for over and under flow
1111
INSERT INTO FLOAT4_TBL(f1) VALUES ('10e40');
12-
ERROR: float4 value out of range: overflow
12+
ERROR: type "real" value out of range: overflow
1313
INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e40');
14-
ERROR: float4 value out of range: overflow
14+
ERROR: type "real" value out of range: overflow
1515
INSERT INTO FLOAT4_TBL(f1) VALUES ('10e-40');
16-
ERROR: float4 value out of range: underflow
16+
ERROR: type "real" value out of range: underflow
1717
INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e-40');
18-
ERROR: float4 value out of range: underflow
18+
ERROR: type "real" value out of range: underflow
1919
SELECT '' AS five, FLOAT4_TBL.*;
2020
five | f1
2121
------+--------------

‎src/test/regress/expected/float8-exp-three-digits.out

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,13 +247,13 @@ UPDATE FLOAT8_TBL
247247
SET f1 = FLOAT8_TBL.f1 * '-1'
248248
WHERE FLOAT8_TBL.f1 > '0.0';
249249
SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f;
250-
ERROR: float8 value out of range: overflow
250+
ERROR: type "double precision" value out of range: overflow
251251
SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
252252
ERROR: result is out of range
253253
SELECT '' AS bad, ln(f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
254-
ERROR: cannot take log of zero
254+
ERROR: cannot take logarithm of zero
255255
SELECT '' AS bad, ln(f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
256-
ERROR: cannot take log of a negative number
256+
ERROR: cannot take logarithm of a negative number
257257
SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f;
258258
ERROR: result is out of range
259259
SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
@@ -270,13 +270,13 @@ SELECT '' AS five, FLOAT8_TBL.*;
270270

271271
-- test for over- and underflow
272272
INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400');
273-
ERROR: "10e400" is out of range for float8
273+
ERROR: "10e400" is out of range for type double precision
274274
INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400');
275-
ERROR: "-10e400" is out of range for float8
275+
ERROR: "-10e400" is out of range for type double precision
276276
INSERT INTO FLOAT8_TBL(f1) VALUES ('10e-400');
277-
ERROR: "10e-400" is out of range for float8
277+
ERROR: "10e-400" is out of range for type double precision
278278
INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e-400');
279-
ERROR: "-10e-400" is out of range for float8
279+
ERROR: "-10e-400" is out of range for type double precision
280280
-- maintain external table consistency across platforms
281281
-- delete all values and reinsert well-behaved ones
282282
DELETE FROM FLOAT8_TBL;

‎src/test/regress/expected/float8-fp-exception.out

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@ DETAIL: An invalid floating-point operation was signaled. This probably means a
252252
SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
253253
ERROR: result is out of range
254254
SELECT '' AS bad, ln(f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
255-
ERROR: cannot take log of zero
255+
ERROR: cannot take logarithm of zero
256256
SELECT '' AS bad, ln(f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
257-
ERROR: cannot take log of a negative number
257+
ERROR: cannot take logarithm of a negative number
258258
SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f;
259259
ERROR: result is out of range
260260
SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
@@ -271,13 +271,13 @@ SELECT '' AS five, FLOAT8_TBL.*;
271271

272272
-- test for over- and underflow
273273
INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400');
274-
ERROR: "10e400" is out of range for float8
274+
ERROR: "10e400" is out of range for type double precision
275275
INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400');
276-
ERROR: "-10e400" is out of range for float8
276+
ERROR: "-10e400" is out of range for type double precision
277277
INSERT INTO FLOAT8_TBL(f1) VALUES ('10e-400');
278-
ERROR: "10e-400" is out of range for float8
278+
ERROR: "10e-400" is out of range for type double precision
279279
INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e-400');
280-
ERROR: "-10e-400" is out of range for float8
280+
ERROR: "-10e-400" is out of range for type double precision
281281
-- maintain external table consistency across platforms
282282
-- delete all values and reinsert well-behaved ones
283283
DELETE FROM FLOAT8_TBL;

‎src/test/regress/expected/float8-small-is-zero.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,13 +247,13 @@ UPDATE FLOAT8_TBL
247247
SET f1 = FLOAT8_TBL.f1 * '-1'
248248
WHERE FLOAT8_TBL.f1 > '0.0';
249249
SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f;
250-
ERROR: float8 value out of range: overflow
250+
ERROR: type "double precision" value out of range: overflow
251251
SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
252252
ERROR: result is out of range
253253
SELECT '' AS bad, ln(f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
254-
ERROR: cannot take log of zero
254+
ERROR: cannot take logarithm of zero
255255
SELECT '' AS bad, ln(f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
256-
ERROR: cannot take log of a negative number
256+
ERROR: cannot take logarithm of a negative number
257257
SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f;
258258
ERROR: result is out of range
259259
SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
@@ -270,9 +270,9 @@ SELECT '' AS five, FLOAT8_TBL.*;
270270

271271
-- test for over- and underflow
272272
INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400');
273-
ERROR: "10e400" is out of range for float8
273+
ERROR: "10e400" is out of range for type double precision
274274
INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400');
275-
ERROR: "-10e400" is out of range for float8
275+
ERROR: "-10e400" is out of range for type double precision
276276
INSERT INTO FLOAT8_TBL(f1) VALUES ('10e-400');
277277
INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e-400');
278278
-- maintain external table consistency across platforms

‎src/test/regress/expected/horology-no-DST-before-1970.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ SELECT timestamp with time zone '12/27/2001 04:05:06.789-08';
8282
-- should fail in mdy mode:
8383
SELECT timestamp with time zone '27/12/2001 04:05:06.789-08';
8484
ERROR: date/time field value out of range: "27/12/2001 04:05:06.789-08"
85-
HINT: Perhaps you need a different DateStyle setting.
85+
HINT: Perhaps you need a different "datestyle" setting.
8686
set datestyle to dmy;
8787
SELECT timestamp with time zone '27/12/2001 04:05:06.789-08';
8888
timestamptz
@@ -306,7 +306,7 @@ SELECT date '1991-02-03' - time '04:05:06' AS "Subtract Time";
306306

307307
SELECT date '1991-02-03' - time with time zone '04:05:06 UTC' AS "Subtract Time UTC";
308308
ERROR: operator does not exist: date - time with time zone
309-
HINT: No operator matches the given name and argument type(s). You may need to add explicit typecasts.
309+
HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts.
310310
--
311311
-- timestamp, interval arithmetic
312312
--
@@ -2356,7 +2356,7 @@ SELECT '' AS two, d1 AS "timestamp", abstime(d1) AS abstime
23562356

23572357
SELECT '' AS three, f1 as abstime, cast(f1 as timestamp) AS "timestamp"
23582358
FROM ABSTIME_TBL WHERE NOT isfinite(f1);
2359-
ERROR: cannot convert "invalid" abstime to timestamp
2359+
ERROR: cannot convert abstime "invalid" to timestamp
23602360
SELECT '' AS ten, f1 AS interval, reltime(f1) AS reltime
23612361
FROM INTERVAL_TBL;
23622362
ten | interval | reltime

‎src/test/regress/expected/horology-solaris-1947.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ SELECT timestamp with time zone '12/27/2001 04:05:06.789-08';
8282
-- should fail in mdy mode:
8383
SELECT timestamp with time zone '27/12/2001 04:05:06.789-08';
8484
ERROR: date/time field value out of range: "27/12/2001 04:05:06.789-08"
85-
HINT: Perhaps you need a different DateStyle setting.
85+
HINT: Perhaps you need a different "datestyle" setting.
8686
set datestyle to dmy;
8787
SELECT timestamp with time zone '27/12/2001 04:05:06.789-08';
8888
timestamptz
@@ -306,7 +306,7 @@ SELECT date '1991-02-03' - time '04:05:06' AS "Subtract Time";
306306

307307
SELECT date '1991-02-03' - time with time zone '04:05:06 UTC' AS "Subtract Time UTC";
308308
ERROR: operator does not exist: date - time with time zone
309-
HINT: No operator matches the given name and argument type(s). You may need to add explicit typecasts.
309+
HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts.
310310
--
311311
-- timestamp, interval arithmetic
312312
--
@@ -2356,7 +2356,7 @@ SELECT '' AS two, d1 AS "timestamp", abstime(d1) AS abstime
23562356

23572357
SELECT '' AS three, f1 as abstime, cast(f1 as timestamp) AS "timestamp"
23582358
FROM ABSTIME_TBL WHERE NOT isfinite(f1);
2359-
ERROR: cannot convert "invalid" abstime to timestamp
2359+
ERROR: cannot convert abstime "invalid" to timestamp
23602360
SELECT '' AS ten, f1 AS interval, reltime(f1) AS reltime
23612361
FROM INTERVAL_TBL;
23622362
ten | interval | reltime

‎src/test/regress/expected/select_implicit.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ SELECT count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY
4444
-- w/o existing GROUP BY target and w/o existing a different ORDER BY target
4545
-- failure expected
4646
SELECT count(*) FROM test_missing_target GROUP BY a ORDER BY b;
47-
ERROR: column "test_missing_target.b" must appear in GROUP BY clause or used in an aggregate function
47+
ERROR: column "test_missing_target.b" must appear in the GROUP BY clause or be used in an aggregate function
4848
-- w/o existing GROUP BY target and w/o existing same ORDER BY target
4949
SELECT count(*) FROM test_missing_target GROUP BY b ORDER BY b;
5050
count
@@ -235,7 +235,7 @@ ORDER BY lower(test_missing_target.c);
235235
-- w/o existing GROUP BY target and w/o existing a different ORDER BY target
236236
-- failure expected
237237
SELECT count(a) FROM test_missing_target GROUP BY a ORDER BY b;
238-
ERROR: column "test_missing_target.b" must appear in GROUP BY clause or used in an aggregate function
238+
ERROR: column "test_missing_target.b" must appear in the GROUP BY clause or be used in an aggregate function
239239
-- w/o existing GROUP BY target and w/o existing same ORDER BY target
240240
SELECT count(b) FROM test_missing_target GROUP BY b/2 ORDER BY b/2;
241241
count

‎src/test/regress/expected/select_implicit_1.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ SELECT count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY
4444
-- w/o existing GROUP BY target and w/o existing a different ORDER BY target
4545
-- failure expected
4646
SELECT count(*) FROM test_missing_target GROUP BY a ORDER BY b;
47-
ERROR: attribute "test_missing_target.b" must be GROUPed or used in an aggregate function
47+
ERROR: column "test_missing_target.b" must appear in the GROUP BY clause or be used in an aggregate function
4848
-- w/o existing GROUP BY target and w/o existing same ORDER BY target
4949
SELECT count(*) FROM test_missing_target GROUP BY b ORDER BY b;
5050
count
@@ -114,7 +114,7 @@ SELECT c, count(*) FROM test_missing_target GROUP BY 1 ORDER BY 1;
114114
-- group using reference number out of range
115115
-- failure expected
116116
SELECT c, count(*) FROM test_missing_target GROUP BY 3;
117-
ERROR: GROUP BY position 3 is not in target list
117+
ERROR: GROUP BY position 3 is not in select list
118118
-- group w/o existing GROUP BY and ORDER BY target under ambiguous condition
119119
-- failure expected
120120
SELECT count(*) FROM test_missing_target x, test_missing_target y
@@ -235,7 +235,7 @@ ORDER BY lower(test_missing_target.c);
235235
-- w/o existing GROUP BY target and w/o existing a different ORDER BY target
236236
-- failure expected
237237
SELECT count(a) FROM test_missing_target GROUP BY a ORDER BY b;
238-
ERROR: attribute "test_missing_target.b" must be GROUPed or used in an aggregate function
238+
ERROR: column "test_missing_target.b" must appear in the GROUP BY clause or be used in an aggregate function
239239
-- w/o existing GROUP BY target and w/o existing same ORDER BY target
240240
SELECT count(b) FROM test_missing_target GROUP BY b/2 ORDER BY b/2;
241241
count

‎src/test/regress/expected/select_implicit_2.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ SELECT count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY
4444
-- w/o existing GROUP BY target and w/o existing a different ORDER BY target
4545
-- failure expected
4646
SELECT count(*) FROM test_missing_target GROUP BY a ORDER BY b;
47-
ERROR: attribute "test_missing_target.b" must be GROUPed or used in an aggregate function
47+
ERROR: column "test_missing_target.b" must appear in the GROUP BY clause or be used in an aggregate function
4848
-- w/o existing GROUP BY target and w/o existing same ORDER BY target
4949
SELECT count(*) FROM test_missing_target GROUP BY b ORDER BY b;
5050
count
@@ -114,7 +114,7 @@ SELECT c, count(*) FROM test_missing_target GROUP BY 1 ORDER BY 1;
114114
-- group using reference number out of range
115115
-- failure expected
116116
SELECT c, count(*) FROM test_missing_target GROUP BY 3;
117-
ERROR: GROUP BY position 3 is not in target list
117+
ERROR: GROUP BY position 3 is not in select list
118118
-- group w/o existing GROUP BY and ORDER BY target under ambiguous condition
119119
-- failure expected
120120
SELECT count(*) FROM test_missing_target x, test_missing_target y
@@ -235,7 +235,7 @@ ORDER BY lower(test_missing_target.c);
235235
-- w/o existing GROUP BY target and w/o existing a different ORDER BY target
236236
-- failure expected
237237
SELECT count(a) FROM test_missing_target GROUP BY a ORDER BY b;
238-
ERROR: attribute "test_missing_target.b" must be GROUPed or used in an aggregate function
238+
ERROR: column "test_missing_target.b" must appear in the GROUP BY clause or be used in an aggregate function
239239
-- w/o existing GROUP BY target and w/o existing same ORDER BY target
240240
SELECT count(b) FROM test_missing_target GROUP BY b/2 ORDER BY b/2;
241241
count

‎src/test/regress/expected/tinterval-solaris-1947.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ INSERT INTO TINTERVAL_TBL (f1)
1717
-- badly formatted tintervals
1818
INSERT INTO TINTERVAL_TBL (f1)
1919
VALUES ('["bad time specifications" ""]');
20-
ERROR: invalid input syntax for abstime: "bad time specifications"
20+
ERROR: invalid input syntax for type abstime: "bad time specifications"
2121
INSERT INTO TINTERVAL_TBL (f1)
2222
VALUES ('["" "infinity"]');
23-
ERROR: invalid input syntax for abstime: ""
23+
ERROR: invalid input syntax for type abstime: ""
2424
-- test tinterval operators
2525
SELECT '' AS five, TINTERVAL_TBL.*;
2626
five | f1

0 commit comments

Comments
 (0)