Do not check nan values for infinity. Some system are not able to handle this.

Michael Meskes · Michael Meskes · commit 492eaefb90b9 · 2010-02-16T18:41:23.000Z
By Zoltán Böszörményi
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.93 2010/02/04 09:41:34 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.94 2010/02/16 18:41:23 meskes Exp $ */
 
 /*
  * The aim is to get a simpler inteface to the database routines.
@@ -468,31 +468,31 @@ ecpg_store_result(const PGresult *results, int act_field,
 static void
 sprintf_double_value(char *ptr, double value, const char *delim)
 {
-	if (isinf(value))
+	if (isnan(value))
+		sprintf(ptr, "%s%s", "NaN", delim);
+	else if (isinf(value))
 	{
 		if (value < 0)
 			sprintf(ptr, "%s%s", "-Infinity", delim);
 		else
 			sprintf(ptr, "%s%s", "Infinity", delim);
 	}
-	else if (isnan(value))
-		sprintf(ptr, "%s%s", "NaN", delim);
 	else
 		sprintf(ptr, "%.14g%s", value, delim);
 }
 
 static void
 sprintf_float_value(char *ptr, float value, const char *delim)
 {
-	if (isinf(value))
+	if (isnan(value))
+		sprintf(ptr, "%s%s", "NaN", delim);
+	else if (isinf(value))
 	{
 		if (value < 0)
 			sprintf(ptr, "%s%s", "-Infinity", delim);
 		else
 			sprintf(ptr, "%s%s", "Infinity", delim);
 	}
-	else if (isnan(value))
-		sprintf(ptr, "%s%s", "NaN", delim);
 	else
 		sprintf(ptr, "%.14g%s", value, delim);
 }
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-nan_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-nan_test.c
@@ -104,10 +104,10 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 
 		if (sqlca.sqlcode)
 			break;
-		if (isinf(d))
-			printf("%d %sInf '%s'\n", id, (d < 0 ? "-" : "+"), val);
 		if (isnan(d))
 			printf("%d  NaN '%s'\n", id, val);
+		else if (isinf(d))
+			printf("%d %sInf '%s'\n", id, (d < 0 ? "-" : "+"), val);
 
 		{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into nantest1 ( id , d ) values ( $1  + 3 , $2  )", 
 	ECPGt_int,&(id),(long)1,(long)1,sizeof(int), 
diff --git a/src/interfaces/ecpg/test/pgtypeslib/nan_test.pgc b/src/interfaces/ecpg/test/pgtypeslib/nan_test.pgc
@@ -37,10 +37,10 @@ main(void)
 		exec sql fetch from cur into :id, :d, :val;
 		if (sqlca.sqlcode)
 			break;
-		if (isinf(d))
-			printf("%d %sInf '%s'\n", id, (d < 0 ? "-" : "+"), val);
 		if (isnan(d))
 			printf("%d  NaN '%s'\n", id, val);
+		else if (isinf(d))
+			printf("%d %sInf '%s'\n", id, (d < 0 ? "-" : "+"), val);
 
 		exec sql insert into nantest1 (id, d) values (:id + 3, :d);
 		exec sql insert into nantest1 (id, d) values (:id + 6, :val);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.93 2010/02/04 09:41:34 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.94 2010/02/16 18:41:23 meskes Exp $ */`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* The aim is to get a simpler inteface to the database routines.`
`@@ -468,31 +468,31 @@ ecpg_store_result(const PGresult *results, int act_field,`
`468`	`468`	`static void`
`469`	`469`	`sprintf_double_value(char ptr, double value, const char delim)`
`470`	`470`	`{`
`471`		`- if (isinf(value))`
	`471`	`+ if (isnan(value))`
	`472`	`+ sprintf(ptr, "%s%s", "NaN", delim);`
	`473`	`+ else if (isinf(value))`
`472`	`474`	`{`
`473`	`475`	`if (value < 0)`
`474`	`476`	`sprintf(ptr, "%s%s", "-Infinity", delim);`
`475`	`477`	`else`
`476`	`478`	`sprintf(ptr, "%s%s", "Infinity", delim);`
`477`	`479`	`}`
`478`		`- else if (isnan(value))`
`479`		`- sprintf(ptr, "%s%s", "NaN", delim);`
`480`	`480`	`else`
`481`	`481`	`sprintf(ptr, "%.14g%s", value, delim);`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`static void`
`485`	`485`	`sprintf_float_value(char ptr, float value, const char delim)`
`486`	`486`	`{`
`487`		`- if (isinf(value))`
	`487`	`+ if (isnan(value))`
	`488`	`+ sprintf(ptr, "%s%s", "NaN", delim);`
	`489`	`+ else if (isinf(value))`
`488`	`490`	`{`
`489`	`491`	`if (value < 0)`
`490`	`492`	`sprintf(ptr, "%s%s", "-Infinity", delim);`
`491`	`493`	`else`
`492`	`494`	`sprintf(ptr, "%s%s", "Infinity", delim);`
`493`	`495`	`}`
`494`		`- else if (isnan(value))`
`495`		`- sprintf(ptr, "%s%s", "NaN", delim);`
`496`	`496`	`else`
`497`	`497`	`sprintf(ptr, "%.14g%s", value, delim);`
`498`	`498`	`}`