mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Throw error on pg_atoi(''), regression adjustments.

Browse Source
This commit is contained in:
Bruce Momjian 2002-08-27 20:29:11 +00:00
parent 7292131c66
commit 73b94657b0
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/utils/adt/numutils.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.51 2002/07/16 18:34:16 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.52 2002/08/27 20:29:10 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -58,9 +58,9 @@ pg_atoi(char *s, int size, int c)
*/ */
if (s == (char *) NULL) if (s == (char *) NULL)
elog(ERROR, "pg_atoi: NULL pointer!"); elog(ERROR, "pg_atoi: NULL pointer");
else if (*s == 0) else if (*s == 0)
l = (long) 0; elog(ERROR, "pg_atoi: zero-length string");
else else
l = strtol(s, &badp, 10); l = strtol(s, &badp, 10);

2
src/test/regress/expected/arrays.out
View File

@ -15,7 +15,7 @@ CREATE TABLE arrtest (
-- 'e' is also a large object. -- 'e' is also a large object.
-- --
INSERT INTO arrtest (a[5], b[2][1][2], c, d, f, g) INSERT INTO arrtest (a[5], b[2][1][2], c, d, f, g)
VALUES ('{1,2,3,4,5}', '{{{},{1,2}}}', '{}', '{}', '{}', '{}'); VALUES ('{1,2,3,4,5}', '{{{0,0},{1,2}}}', '{}', '{}', '{}', '{}');
UPDATE arrtest SET e[0] = '1.1'; UPDATE arrtest SET e[0] = '1.1';
UPDATE arrtest SET e[1] = '2.2'; UPDATE arrtest SET e[1] = '2.2';
INSERT INTO arrtest (f) INSERT INTO arrtest (f)

2
src/test/regress/expected/copy2.out
View File

@ -34,7 +34,7 @@ COPY x (a, b, c, d, e, d, c) from stdin;
ERROR: Attribute "d" specified more than once ERROR: Attribute "d" specified more than once
-- missing data: should fail -- missing data: should fail
COPY x from stdin; COPY x from stdin;
ERROR: copy: line 1, Missing data for column "b" ERROR: copy: line 1, pg_atoi: zero-length string
lost synchronization with server, resetting connection lost synchronization with server, resetting connection
COPY x from stdin; COPY x from stdin;
ERROR: copy: line 1, Missing data for column "e" ERROR: copy: line 1, Missing data for column "e"

2
src/test/regress/sql/arrays.sql
View File

@ -18,7 +18,7 @@ CREATE TABLE arrtest (
-- --
INSERT INTO arrtest (a[5], b[2][1][2], c, d, f, g) INSERT INTO arrtest (a[5], b[2][1][2], c, d, f, g)
VALUES ('{1,2,3,4,5}', '{{{},{1,2}}}', '{}', '{}', '{}', '{}'); VALUES ('{1,2,3,4,5}', '{{{0,0},{1,2}}}', '{}', '{}', '{}', '{}');
UPDATE arrtest SET e[0] = '1.1'; UPDATE arrtest SET e[0] = '1.1';