Skip to content

Commit 975e273

Browse files
author
Neil Conway
committed
Adjust input routines for float4, float8 and oid to reject the empty string
as valid input (it was previously treated as 0). This input was deprecated in 8.0 (and a warning was emitted). Regression tests updated.
1 parent 4db84f0 commit 975e273

13 files changed

+36
-43
lines changed

‎src/backend/utils/adt/float.c

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.112 2004/12/31 22:01:21 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.113 2005/02/11 04:08:58 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -267,21 +267,12 @@ float4in(PG_FUNCTION_ARGS)
267267
/*
268268
* Check for an empty-string input to begin with, to avoid the
269269
* vagaries of strtod() on different platforms.
270-
*
271-
* In releases prior to 8.0, we accepted an empty string as valid input
272-
* (yielding a float4 of 0). In 8.0, we accept empty strings, but emit
273-
* a warning noting that the feature is deprecated. In 8.1+, the
274-
* warning should be replaced by an error.
275270
*/
276271
if (*num == '\0')
277-
{
278-
ereport(WARNING,
279-
(errcode(ERRCODE_WARNING_DEPRECATED_FEATURE),
280-
errmsg("deprecated input syntax for type real: \"\""),
281-
errdetail("This input will be rejected in "
282-
"a future release of PostgreSQL.")));
283-
PG_RETURN_FLOAT4((float4) 0.0);
284-
}
272+
ereport(ERROR,
273+
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
274+
errmsg("invalid input syntax for type real: \"%s\"",
275+
orig_num)));
285276

286277
/* skip leading whitespace */
287278
while (*num != '\0' && isspace((unsigned char) *num))
@@ -444,21 +435,12 @@ float8in(PG_FUNCTION_ARGS)
444435
/*
445436
* Check for an empty-string input to begin with, to avoid the
446437
* vagaries of strtod() on different platforms.
447-
*
448-
* In releases prior to 8.0, we accepted an empty string as valid input
449-
* (yielding a float8 of 0). In 8.0, we accept empty strings, but emit
450-
* a warning noting that the feature is deprecated. In 8.1+, the
451-
* warning should be replaced by an error.
452438
*/
453439
if (*num == '\0')
454-
{
455-
ereport(WARNING,
456-
(errcode(ERRCODE_WARNING_DEPRECATED_FEATURE),
457-
errmsg("deprecated input syntax for type double precision: \"\""),
458-
errdetail("This input will be rejected in "
459-
"a future release of PostgreSQL.")));
460-
PG_RETURN_FLOAT8(0.0);
461-
}
440+
ereport(ERROR,
441+
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
442+
errmsg("invalid input syntax for type double precision: \"%s\"",
443+
orig_num)));
462444

463445
/* skip leading whitespace */
464446
while (*num != '\0' && isspace((unsigned char) *num))

‎src/backend/utils/adt/oid.c

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/oid.c,v 1.60 2004/12/31 22:01:22 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/oid.c,v 1.61 2005/02/11 04:08:58 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -33,18 +33,11 @@ oidin_subr(const char *funcname, const char *s, char **endloc)
3333
char *endptr;
3434
Oid result;
3535

36-
/*
37-
* In releases prior to 8.0, we accepted an empty string as valid
38-
* input (yielding an OID of 0). In 8.0, we accept empty strings, but
39-
* emit a warning noting that the feature is deprecated. In 8.1+, the
40-
* warning should be replaced by an error.
41-
*/
4236
if (*s == '\0')
43-
ereport(WARNING,
44-
(errcode(ERRCODE_WARNING_DEPRECATED_FEATURE),
45-
errmsg("deprecated input syntax for type oid: \"\""),
46-
errdetail("This input will be rejected in "
47-
"a future release of PostgreSQL.")));
37+
ereport(ERROR,
38+
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
39+
errmsg("invalid input syntax for type oid: \"%s\"",
40+
s)));
4841

4942
errno = 0;
5043
cvt = strtoul(s, &endptr, 10);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ ERROR: type "real" value out of range: underflow
1717
INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e-40');
1818
ERROR: type "real" value out of range: underflow
1919
-- bad input
20+
INSERT INTO FLOAT4_TBL(f1) VALUES ('');
21+
ERROR: invalid input syntax for type real: ""
2022
INSERT INTO FLOAT4_TBL(f1) VALUES (' ');
2123
ERROR: invalid input syntax for type real: " "
2224
INSERT INTO FLOAT4_TBL(f1) VALUES ('xyz');

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ ERROR: type "real" value out of range: underflow
1717
INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e-40');
1818
ERROR: type "real" value out of range: underflow
1919
-- bad input
20+
INSERT INTO FLOAT4_TBL(f1) VALUES ('');
21+
ERROR: invalid input syntax for type real: ""
2022
INSERT INTO FLOAT4_TBL(f1) VALUES (' ');
2123
ERROR: invalid input syntax for type real: " "
2224
INSERT INTO FLOAT4_TBL(f1) VALUES ('xyz');

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ ERROR: "10e-400" is out of range for type double precision
1717
SELECT '-10e-400'::float8;
1818
ERROR: "-10e-400" is out of range for type double precision
1919
-- bad input
20+
INSERT INTO FLOAT8_TBL(f1) VALUES ('');
21+
ERROR: invalid input syntax for type double precision: ""
2022
INSERT INTO FLOAT8_TBL(f1) VALUES (' ');
2123
ERROR: invalid input syntax for type double precision: " "
2224
INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ ERROR: "10e-400" is out of range for type double precision
1717
SELECT '-10e-400'::float8;
1818
ERROR: "-10e-400" is out of range for type double precision
1919
-- bad input
20+
INSERT INTO FLOAT8_TBL(f1) VALUES ('');
21+
ERROR: invalid input syntax for type double precision: ""
2022
INSERT INTO FLOAT8_TBL(f1) VALUES (' ');
2123
ERROR: invalid input syntax for type double precision: " "
2224
INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ SELECT '-10e-400'::float8;
2525
(1 row)
2626

2727
-- bad input
28+
INSERT INTO FLOAT8_TBL(f1) VALUES ('');
29+
ERROR: invalid input syntax for type double precision: ""
2830
INSERT INTO FLOAT8_TBL(f1) VALUES (' ');
2931
ERROR: invalid input syntax for type double precision: " "
3032
INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ SELECT '-10e-400'::float8;
2525
(1 row)
2626

2727
-- bad input
28+
INSERT INTO FLOAT8_TBL(f1) VALUES ('');
29+
ERROR: invalid input syntax for type double precision: ""
2830
INSERT INTO FLOAT8_TBL(f1) VALUES (' ');
2931
ERROR: invalid input syntax for type double precision: " "
3032
INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ ERROR: "10e-400" is out of range for type double precision
1717
SELECT '-10e-400'::float8;
1818
ERROR: "-10e-400" is out of range for type double precision
1919
-- bad input
20+
INSERT INTO FLOAT8_TBL(f1) VALUES ('');
21+
ERROR: invalid input syntax for type double precision: ""
2022
INSERT INTO FLOAT8_TBL(f1) VALUES (' ');
2123
ERROR: invalid input syntax for type double precision: " "
2224
INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ INSERT INTO OID_TBL(f1) VALUES (' 10 ');
1212
-- leading/trailing hard tab is also allowed
1313
INSERT INTO OID_TBL(f1) VALUES (' 15 ');
1414
-- bad inputs
15+
INSERT INTO OID_TBL(f1) VALUES ('');
16+
ERROR: invalid input syntax for type oid: ""
17+
INSERT INTO OID_TBL(f1) VALUES (' ');
18+
ERROR: invalid input syntax for type oid: " "
1519
INSERT INTO OID_TBL(f1) VALUES ('asdfasd');
1620
ERROR: invalid input syntax for type oid: "asdfasd"
1721
INSERT INTO OID_TBL(f1) VALUES ('99asdfasd');
@@ -22,8 +26,6 @@ INSERT INTO OID_TBL(f1) VALUES (' 5d');
2226
ERROR: invalid input syntax for type oid: " 5d"
2327
INSERT INTO OID_TBL(f1) VALUES ('5 5');
2428
ERROR: invalid input syntax for type oid: "5 5"
25-
INSERT INTO OID_TBL(f1) VALUES (' ');
26-
ERROR: invalid input syntax for type oid: " "
2729
INSERT INTO OID_TBL(f1) VALUES (' - 500');
2830
ERROR: invalid input syntax for type oid: " - 500"
2931
INSERT INTO OID_TBL(f1) VALUES ('32958209582039852935');

‎src/test/regress/sql/float4.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ INSERT INTO FLOAT4_TBL(f1) VALUES ('10e-40');
1717
INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e-40');
1818

1919
-- bad input
20+
INSERT INTO FLOAT4_TBL(f1) VALUES ('');
2021
INSERT INTO FLOAT4_TBL(f1) VALUES (' ');
2122
INSERT INTO FLOAT4_TBL(f1) VALUES ('xyz');
2223
INSERT INTO FLOAT4_TBL(f1) VALUES ('5.0.0');

‎src/test/regress/sql/float8.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ SELECT '10e-400'::float8;
1717
SELECT '-10e-400'::float8;
1818

1919
-- bad input
20+
INSERT INTO FLOAT8_TBL(f1) VALUES ('');
2021
INSERT INTO FLOAT8_TBL(f1) VALUES (' ');
2122
INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');
2223
INSERT INTO FLOAT8_TBL(f1) VALUES ('5.0.0');

‎src/test/regress/sql/oid.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ INSERT INTO OID_TBL(f1) VALUES (' 10 ');
1515
INSERT INTO OID_TBL(f1) VALUES (' 15 ');
1616

1717
-- bad inputs
18-
18+
INSERT INTO OID_TBL(f1) VALUES ('');
19+
INSERT INTO OID_TBL(f1) VALUES (' ');
1920
INSERT INTO OID_TBL(f1) VALUES ('asdfasd');
2021
INSERT INTO OID_TBL(f1) VALUES ('99asdfasd');
2122
INSERT INTO OID_TBL(f1) VALUES ('5 d');
2223
INSERT INTO OID_TBL(f1) VALUES (' 5d');
2324
INSERT INTO OID_TBL(f1) VALUES ('5 5');
24-
INSERT INTO OID_TBL(f1) VALUES (' ');
2525
INSERT INTO OID_TBL(f1) VALUES (' - 500');
2626
INSERT INTO OID_TBL(f1) VALUES ('32958209582039852935');
2727
INSERT INTO OID_TBL(f1) VALUES ('-23582358720398502385');

0 commit comments

Comments
 (0)