Fixed error handling in numeric conversion (Joachim).

Michael Meskes · Michael Meskes · commit 7c9e2c75dab4 · 2006-08-09T07:30:56.000Z
Further regression cleanup.
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -2076,5 +2076,9 @@ Mo Aug  7 14:56:44 CEST 2006
 Tu Aug  8 13:26:25 CEST 2006
 
 	- Made parser check for valid copy to/from stdin/stdout combinations.
+
+We Aug  9 09:28:56 CEST 2006
+
+	- Fixed error handling in numeric conversion (Joachim).
 	- Set ecpg library version to 5.2.
 	- Set ecpg version to 4.2.1.
diff --git a/src/interfaces/ecpg/include/pgtypes_numeric.h b/src/interfaces/ecpg/include/pgtypes_numeric.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_numeric.h,v 1.15 2006/03/11 04:38:39 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_numeric.h,v 1.16 2006/08/09 07:30:56 meskes Exp $ */
 
 #ifndef PGTYPES_NUMERIC
 #define PGTYPES_NUMERIC
@@ -41,7 +41,9 @@ extern		"C"
 #endif
 
 numeric    *PGTYPESnumeric_new(void);
+decimal    *PGTYPESdecimal_new(void);
 void		PGTYPESnumeric_free(numeric *);
+void		PGTYPESdecimal_free(decimal *);
 numeric    *PGTYPESnumeric_from_asc(char *, char **);
 char	   *PGTYPESnumeric_to_asc(numeric *, int);
 int			PGTYPESnumeric_add(numeric *, numeric *, numeric *);
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/numeric.c,v 1.28 2006/08/07 13:17:01 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/numeric.c,v 1.29 2006/08/09 07:30:56 meskes Exp $ */
 
 #include "postgres_fe.h"
 #include <ctype.h>
@@ -139,6 +139,18 @@ PGTYPESnumeric_new(void)
 	return var;
 }
 
+decimal *
+PGTYPESdecimal_new(void)
+{
+	decimal    *var;
+	if ((var = (decimal *) pgtypes_alloc(sizeof(decimal))) == NULL)
+		return NULL;
+
+	memset(var, 0, sizeof(decimal));
+
+	return var;
+}
+
 /* ----------
  * set_var_from_str()
  *
@@ -425,6 +437,12 @@ PGTYPESnumeric_free(numeric *var)
 	free(var);
 }
 
+void
+PGTYPESdecimal_free(decimal *var)
+{
+	free(var);
+}
+
 /* ----------
  * cmp_abs() -
  *
@@ -1461,19 +1479,25 @@ PGTYPESnumeric_from_double(double d, numeric *dst)
 }
 
 static int
-numericvar_to_double_no_overflow(numeric *var, double *dp)
+numericvar_to_double(numeric *var, double *dp)
 {
 	char	   *tmp;
 	double		val;
 	char	   *endptr;
 	numeric	   *varcopy = PGTYPESnumeric_new();
+	int i;
 
 	if (PGTYPESnumeric_copy(var, varcopy) < 0)
 		return -1;
 	if ((tmp = get_str_from_var(varcopy, varcopy->dscale)) == NULL)
 		return -1;
 	PGTYPESnumeric_free(varcopy);
 
+	/*
+	 * strtod seems to not reset errno to 0 in case of success.
+	 * at least on aome architectures
+	 */
+	errno = 0;
 	val = strtod(tmp, &endptr);
 	if (errno == ERANGE)
 	{
@@ -1501,7 +1525,7 @@ PGTYPESnumeric_to_double(numeric *nv, double *dp)
 	double		tmp;
 	int			i;
 
-	if ((i = numericvar_to_double_no_overflow(nv, &tmp)) != 0)
+	if ((i = numericvar_to_double(nv, &tmp)) != 0)
 		return -1;
 	*dp = tmp;
 	return 0;
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c
@@ -24,9 +24,13 @@
 #line 7 "num_test2.pgc"
 
 
-char* nums[] = { "2E394", "-2", ".794", "3.44", "592.49E07", "-32.84e4",
+char* nums[] = { "2E394", "-2", ".794", "3.44", "592.49E21", "-32.84e4",
 				 "2E-394", ".1E-2", "+.0", "-592.49E-07", "+32.84e-4",
 				 ".500001", "-.5000001",
+				 "1234567890123456789012345678.91", /* 30 digits should fit
+				                                       into decimal */
+				 "1234567890123456789012345678.921", /* 31 digits should NOT
+				                                        fit into decimal */
 				 NULL};
 
 
@@ -39,8 +43,9 @@ main(void)
 	char *text="error\n";
 	char *endptr;
 	numeric *num, *nin;
+	decimal *dec;
 	long l;
-	int i, r, k;
+	int i, q, r, k;
 	double d;
 
 	ECPGdebug(1, stderr);
@@ -79,8 +84,9 @@ main(void)
 			r = PGTYPESnumeric_from_long(l, nin);
 			check_errno();
 			text = PGTYPESnumeric_to_asc(nin, 2);
-			r = PGTYPESnumeric_cmp(num, nin);
-			printf("num[%d,7]: %s (cmp: %d)\n", i, text, r); free(text);
+			q = PGTYPESnumeric_cmp(num, nin);
+			printf("num[%d,7]: %s (r: %d - cmp: %d)\n", i, text, r, q);
+			free(text);
 		}
 
 		r = PGTYPESnumeric_to_int(num, &k);
@@ -91,8 +97,9 @@ main(void)
 			r = PGTYPESnumeric_from_int(k, nin);
 			check_errno();
 			text = PGTYPESnumeric_to_asc(nin, 2);
-			r = PGTYPESnumeric_cmp(num, nin);
-			printf("num[%d,9]: %s (cmp: %d)\n", i, text, r); free(text);
+			q = PGTYPESnumeric_cmp(num, nin);
+			printf("num[%d,9]: %s (r: %d - cmp: %d)\n", i, text, r, q);
+			free(text);
 		}
 
 		r = PGTYPESnumeric_to_double(num, &d);
@@ -103,11 +110,28 @@ main(void)
 			r = PGTYPESnumeric_from_double(d, nin);
 			check_errno();
 			text = PGTYPESnumeric_to_asc(nin, 2);
-			r = PGTYPESnumeric_cmp(num, nin);
-			printf("num[%d,11]: %s (cmp: %d)\n", i, text, r); free(text);
+			q = PGTYPESnumeric_cmp(num, nin);
+			printf("num[%d,11]: %s (r: %d - cmp: %d)\n", i, text, r, q);
+			free(text);
 		}
 
-		/* xxx decimal conversions still missing */
+		dec = PGTYPESdecimal_new();
+		r = PGTYPESnumeric_to_decimal(num, dec);
+		check_errno();
+		/* we have no special routine for outputting decimal, it would
+		 * convert to a numeric anyway */
+		printf("num[%d,12]: - (r: %d)\n", i, r);
+		if (r == 0)
+		{
+			r = PGTYPESnumeric_from_decimal(dec, nin);
+			check_errno();
+			text = PGTYPESnumeric_to_asc(nin, 2);
+			q = PGTYPESnumeric_cmp(num, nin);
+			printf("num[%d,13]: %s (r: %d - cmp: %d)\n", i, text, r, q);
+			free(text);
+		}
+
+		PGTYPESdecimal_free(dec);
 		PGTYPESnumeric_free(nin);
 		printf("\n");
 	}
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.stdout b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.stdout
diff --git a/src/interfaces/ecpg/test/pgtypeslib/num_test2.pgc b/src/interfaces/ecpg/test/pgtypeslib/num_test2.pgc
