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

bmomjian · bmomjian · commit 73b94657b001 · 2002-08-27T20:29:11.000Z
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
@@ -11,7 +11,7 @@
  *
  *
  * 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)
-		elog(ERROR, "pg_atoi: NULL pointer!");
+		elog(ERROR, "pg_atoi: NULL pointer");
 	else if (*s == 0)
-		l = (long) 0;
+		elog(ERROR, "pg_atoi: zero-length string");
 	else
 		l = strtol(s, &badp, 10);
 
diff --git a/src/test/regress/expected/arrays.out b/src/test/regress/expected/arrays.out
@@ -15,7 +15,7 @@ CREATE TABLE arrtest (
 -- 'e' is also a large object.
 --
 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[1] = '2.2';
 INSERT INTO arrtest (f)
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
@@ -34,7 +34,7 @@ COPY x (a, b, c, d, e, d, c) from stdin;
 ERROR:  Attribute "d" specified more than once
 -- missing data: should fail
 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
 COPY x from stdin;
 ERROR:  copy: line 1, Missing data for column "e"
diff --git a/src/test/regress/sql/arrays.sql b/src/test/regress/sql/arrays.sql
@@ -18,7 +18,7 @@ CREATE TABLE arrtest (
 --
 
 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';
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.51 2002/07/16 18:34:16 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.52 2002/08/27 20:29:10 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -58,9 +58,9 @@ pg_atoi(char *s, int size, int c)`
`58`	`58`	`*/`
`59`	`59`
`60`	`60`	`if (s == (char *) NULL)`
`61`		`- elog(ERROR, "pg_atoi: NULL pointer!");`
	`61`	`+ elog(ERROR, "pg_atoi: NULL pointer");`
`62`	`62`	`else if (*s == 0)`
`63`		`- l = (long) 0;`
	`63`	`+ elog(ERROR, "pg_atoi: zero-length string");`
`64`	`64`	`else`
`65`	`65`	`l = strtol(s, &badp, 10);`
`66`	`66`