Skip to content

G
Gpdb

Greenplum / Gpdb

通知 7
Star 1
Fork 0
G
Gpdb

体验新版 GitCode，发现更多精彩内容 >>

提交 7c9e2c75 编写于 作者: M Michael Meskes
浏览文件
操作

Fixed error handling in numeric conversion (Joachim). 

Further regression cleanup.
上级 8a7a6afe
隐藏空白更改
内联 并排
Showing with 189 addition and 60 deletion
src/interfaces/ecpg/ChangeLog
浏览文件 @ 7c9e2c75
...@@ -2076,5 +2076,9 @@ Mo Aug 7 14:56:44 CEST 2006 ...@@ -2076,5 +2076,9 @@ Mo Aug 7 14:56:44 CEST 2006
Tu Aug 8 13:26:25 CEST 2006 Tu Aug 8 13:26:25 CEST 2006
- Made parser check for valid copy to/from stdin/stdout combinations. - 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 library version to 5.2.
- Set ecpg version to 4.2.1. - Set ecpg version to 4.2.1.
src/interfaces/ecpg/include/pgtypes_numeric.h
浏览文件 @ 7c9e2c75
/* $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 #ifndef PGTYPES_NUMERIC
#define PGTYPES_NUMERIC #define PGTYPES_NUMERIC
...@@ -41,7 +41,9 @@ extern "C" ...@@ -41,7 +41,9 @@ extern "C"
#endif #endif
numeric *PGTYPESnumeric_new(void); numeric *PGTYPESnumeric_new(void);
decimal *PGTYPESdecimal_new(void);
void PGTYPESnumeric_free(numeric *); void PGTYPESnumeric_free(numeric *);
void PGTYPESdecimal_free(decimal *);
numeric *PGTYPESnumeric_from_asc(char *, char **); numeric *PGTYPESnumeric_from_asc(char *, char **);
char *PGTYPESnumeric_to_asc(numeric *, int); char *PGTYPESnumeric_to_asc(numeric *, int);
int PGTYPESnumeric_add(numeric *, numeric *, numeric *); int PGTYPESnumeric_add(numeric *, numeric *, numeric *);
......
src/interfaces/ecpg/pgtypeslib/numeric.c
浏览文件 @ 7c9e2c75
/* $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 "postgres_fe.h"
#include <ctype.h> #include <ctype.h>
...@@ -139,6 +139,18 @@ PGTYPESnumeric_new(void) ...@@ -139,6 +139,18 @@ PGTYPESnumeric_new(void)
return var; 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() * set_var_from_str()
* *
...@@ -425,6 +437,12 @@ PGTYPESnumeric_free(numeric *var) ...@@ -425,6 +437,12 @@ PGTYPESnumeric_free(numeric *var)
free(var); free(var);
} }
void
PGTYPESdecimal_free(decimal *var)
{
free(var);
}
/* ---------- /* ----------
* cmp_abs() - * cmp_abs() -
* *
...@@ -1461,12 +1479,13 @@ PGTYPESnumeric_from_double(double d, numeric *dst) ...@@ -1461,12 +1479,13 @@ PGTYPESnumeric_from_double(double d, numeric *dst)
} }
static int static int
numericvar_to_double_no_overflow(numeric *var, double *dp) numericvar_to_double(numeric *var, double *dp)
{ {
char *tmp; char *tmp;
double val; double val;
char *endptr; char *endptr;
numeric *varcopy = PGTYPESnumeric_new(); numeric *varcopy = PGTYPESnumeric_new();
int i;
if (PGTYPESnumeric_copy(var, varcopy) < 0) if (PGTYPESnumeric_copy(var, varcopy) < 0)
return -1; return -1;
...@@ -1474,6 +1493,11 @@ numericvar_to_double_no_overflow(numeric *var, double *dp) ...@@ -1474,6 +1493,11 @@ numericvar_to_double_no_overflow(numeric *var, double *dp)
return -1; return -1;
PGTYPESnumeric_free(varcopy); 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); val = strtod(tmp, &endptr);
if (errno == ERANGE) if (errno == ERANGE)
{ {
...@@ -1501,7 +1525,7 @@ PGTYPESnumeric_to_double(numeric *nv, double *dp) ...@@ -1501,7 +1525,7 @@ PGTYPESnumeric_to_double(numeric *nv, double *dp)
double tmp; double tmp;
int i; int i;
if ((i = numericvar_to_double_no_overflow(nv, &tmp)) != 0) if ((i = numericvar_to_double(nv, &tmp)) != 0)
return -1; return -1;
*dp = tmp; *dp = tmp;
return 0; return 0;
......
src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c
浏览文件 @ 7c9e2c75
...@@ -24,9 +24,13 @@ ...@@ -24,9 +24,13 @@
#line 7 "num_test2.pgc" #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", "2E-394", ".1E-2", "+.0", "-592.49E-07", "+32.84e-4",
".500001", "-.5000001", ".500001", "-.5000001",
"1234567890123456789012345678.91", /* 30 digits should fit
into decimal */
"1234567890123456789012345678.921", /* 31 digits should NOT
fit into decimal */
NULL}; NULL};
...@@ -39,8 +43,9 @@ main(void) ...@@ -39,8 +43,9 @@ main(void)
char *text="error\n"; char *text="error\n";
char *endptr; char *endptr;
numeric *num, *nin; numeric *num, *nin;
decimal *dec;
long l; long l;
int i, r, k; int i, q, r, k;
double d; double d;
ECPGdebug(1, stderr); ECPGdebug(1, stderr);
...@@ -79,8 +84,9 @@ main(void) ...@@ -79,8 +84,9 @@ main(void)
r = PGTYPESnumeric_from_long(l, nin); r = PGTYPESnumeric_from_long(l, nin);
check_errno(); check_errno();
text = PGTYPESnumeric_to_asc(nin, 2); text = PGTYPESnumeric_to_asc(nin, 2);
r = PGTYPESnumeric_cmp(num, nin); q = PGTYPESnumeric_cmp(num, nin);
printf("num[%d,7]: %s (cmp: %d)\n", i, text, r); free(text); printf("num[%d,7]: %s (r: %d - cmp: %d)\n", i, text, r, q);
free(text);
} }
r = PGTYPESnumeric_to_int(num, &k); r = PGTYPESnumeric_to_int(num, &k);
...@@ -91,8 +97,9 @@ main(void) ...@@ -91,8 +97,9 @@ main(void)
r = PGTYPESnumeric_from_int(k, nin); r = PGTYPESnumeric_from_int(k, nin);
check_errno(); check_errno();
text = PGTYPESnumeric_to_asc(nin, 2); text = PGTYPESnumeric_to_asc(nin, 2);
r = PGTYPESnumeric_cmp(num, nin); q = PGTYPESnumeric_cmp(num, nin);
printf("num[%d,9]: %s (cmp: %d)\n", i, text, r); free(text); printf("num[%d,9]: %s (r: %d - cmp: %d)\n", i, text, r, q);
free(text);
} }
r = PGTYPESnumeric_to_double(num, &d); r = PGTYPESnumeric_to_double(num, &d);
...@@ -103,11 +110,28 @@ main(void) ...@@ -103,11 +110,28 @@ main(void)
r = PGTYPESnumeric_from_double(d, nin); r = PGTYPESnumeric_from_double(d, nin);
check_errno(); check_errno();
text = PGTYPESnumeric_to_asc(nin, 2); text = PGTYPESnumeric_to_asc(nin, 2);
r = PGTYPESnumeric_cmp(num, nin); q = PGTYPESnumeric_cmp(num, nin);
printf("num[%d,11]: %s (cmp: %d)\n", i, text, r); free(text); 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); PGTYPESnumeric_free(nin);
printf("\n"); printf("\n");
} }
......
src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.stdout
浏览文件 @ 7c9e2c75
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
(errno == PGTYPES_NUM_OVERFLOW) - num[0,6]: 0 (r: -1) (errno == PGTYPES_NUM_OVERFLOW) - num[0,6]: 0 (r: -1)
(errno == PGTYPES_NUM_OVERFLOW) - num[0,8]: 0 (r: -1) (errno == PGTYPES_NUM_OVERFLOW) - num[0,8]: 0 (r: -1)
(errno == PGTYPES_NUM_OVERFLOW) - num[0,10]: 0.0000000 (r: -1) (errno == PGTYPES_NUM_OVERFLOW) - num[0,10]: 0.0000000 (r: -1)
(errno == PGTYPES_NUM_OVERFLOW) - num[0,12]: - (r: 0)
(errno == PGTYPES_NUM_OVERFLOW) - num[0,13]: 20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.00 (r: 0 - cmp: 0)
(no errno set) - endptr of 1 is not NULL (no errno set) - endptr of 1 is not NULL
(no errno set) - num[1,1]: -2 (no errno set) - num[1,1]: -2
...@@ -15,11 +17,13 @@ ...@@ -15,11 +17,13 @@
(no errno set) - num[1,4]: -2.00 (no errno set) - num[1,4]: -2.00
(no errno set) - num[1,5]: 0.00 (no errno set) - num[1,5]: 0.00
(no errno set) - num[1,6]: -2 (r: 0) (no errno set) - num[1,6]: -2 (r: 0)
(no errno set) - num[1,7]: -2.00 (cmp: 0) (no errno set) - num[1,7]: -2.00 (r: 0 - cmp: 0)
(no errno set) - num[1,8]: -2 (r: 0) (no errno set) - num[1,8]: -2 (r: 0)
(no errno set) - num[1,9]: -2.00 (cmp: 0) (no errno set) - num[1,9]: -2.00 (r: 0 - cmp: 0)
(no errno set) - num[1,10]: -2.0000000 (r: 0) (no errno set) - num[1,10]: -2.0000000 (r: 0)
(no errno set) - num[1,11]: -2.00 (cmp: 0) (no errno set) - num[1,11]: -2.00 (r: 0 - cmp: 0)
(no errno set) - num[1,12]: - (r: 0)
(no errno set) - num[1,13]: -2.00 (r: 0 - cmp: 0)
(no errno set) - endptr of 2 is not NULL (no errno set) - endptr of 2 is not NULL
(no errno set) - num[2,1]: 0.794 (no errno set) - num[2,1]: 0.794
...@@ -28,11 +32,13 @@ ...@@ -28,11 +32,13 @@
(no errno set) - num[2,4]: 0.79 (no errno set) - num[2,4]: 0.79
(no errno set) - num[2,5]: 0.00 (no errno set) - num[2,5]: 0.00
(no errno set) - num[2,6]: 1 (r: 0) (no errno set) - num[2,6]: 1 (r: 0)
(no errno set) - num[2,7]: 1.00 (cmp: -1) (no errno set) - num[2,7]: 1.00 (r: 0 - cmp: -1)
(no errno set) - num[2,8]: 1 (r: 0) (no errno set) - num[2,8]: 1 (r: 0)
(no errno set) - num[2,9]: 1.00 (cmp: -1) (no errno set) - num[2,9]: 1.00 (r: 0 - cmp: -1)
(no errno set) - num[2,10]: 0.7940000 (r: 0) (no errno set) - num[2,10]: 0.7940000 (r: 0)
(no errno set) - num[2,11]: 0.79 (cmp: 0) (no errno set) - num[2,11]: 0.79 (r: 0 - cmp: 0)
(no errno set) - num[2,12]: - (r: 0)
(no errno set) - num[2,13]: 0.79 (r: 0 - cmp: 0)
(no errno set) - endptr of 3 is not NULL (no errno set) - endptr of 3 is not NULL
(no errno set) - num[3,1]: 3.44 (no errno set) - num[3,1]: 3.44
...@@ -41,22 +47,26 @@ ...@@ -41,22 +47,26 @@
(no errno set) - num[3,4]: 3.44 (no errno set) - num[3,4]: 3.44
(no errno set) - num[3,5]: 0.00 (no errno set) - num[3,5]: 0.00
(no errno set) - num[3,6]: 3 (r: 0) (no errno set) - num[3,6]: 3 (r: 0)
(no errno set) - num[3,7]: 3.00 (cmp: 1) (no errno set) - num[3,7]: 3.00 (r: 0 - cmp: 1)
(no errno set) - num[3,8]: 3 (r: 0) (no errno set) - num[3,8]: 3 (r: 0)
(no errno set) - num[3,9]: 3.00 (cmp: 1) (no errno set) - num[3,9]: 3.00 (r: 0 - cmp: 1)
(no errno set) - num[3,10]: 3.4400000 (r: 0) (no errno set) - num[3,10]: 3.4400000 (r: 0)
(no errno set) - num[3,11]: 3.44 (cmp: 0) (no errno set) - num[3,11]: 3.44 (r: 0 - cmp: 0)
(no errno set) - num[3,12]: - (r: 0)
(no errno set) - num[3,13]: 3.44 (r: 0 - cmp: 0)
(no errno set) - endptr of 4 is not NULL (no errno set) - endptr of 4 is not NULL
(no errno set) - num[4,1]: 5924900000 (no errno set) - num[4,1]: 592490000000000000000000
(no errno set) - num[4,2]: 5924900000 (no errno set) - num[4,2]: 592490000000000000000000
(no errno set) - num[4,3]: 5924900000.0 (no errno set) - num[4,3]: 592490000000000000000000.0
(no errno set) - num[4,4]: 5924900000.00 (no errno set) - num[4,4]: 592490000000000000000000.00
(no errno set) - num[4,5]: 0.00 (no errno set) - num[4,5]: 0.00
(errno == PGTYPES_NUM_OVERFLOW) - num[4,6]: 0 (r: -1) (errno == PGTYPES_NUM_OVERFLOW) - num[4,6]: 0 (r: -1)
(errno == PGTYPES_NUM_OVERFLOW) - num[4,8]: 0 (r: -1) (errno == PGTYPES_NUM_OVERFLOW) - num[4,8]: 0 (r: -1)
(errno == PGTYPES_NUM_OVERFLOW) - num[4,10]: 5924900000.0000000 (r: 0) (no errno set) - num[4,10]: 592490000000000009961472.0000000 (r: 0)
(no errno set) - num[4,11]: 5924900000.00 (cmp: 0) (no errno set) - num[4,11]: 592490000000000009961472.00 (r: 0 - cmp: -1)
(no errno set) - num[4,12]: - (r: 0)
(no errno set) - num[4,13]: 592490000000000000000000.00 (r: 0 - cmp: 0)
(no errno set) - endptr of 5 is not NULL (no errno set) - endptr of 5 is not NULL
(no errno set) - num[5,1]: -328400 (no errno set) - num[5,1]: -328400
...@@ -65,11 +75,13 @@ ...@@ -65,11 +75,13 @@
(no errno set) - num[5,4]: -328400.00 (no errno set) - num[5,4]: -328400.00
(no errno set) - num[5,5]: 0.00 (no errno set) - num[5,5]: 0.00
(no errno set) - num[5,6]: -328400 (r: 0) (no errno set) - num[5,6]: -328400 (r: 0)
(no errno set) - num[5,7]: -328400.00 (cmp: 0) (no errno set) - num[5,7]: -328400.00 (r: 0 - cmp: 0)
(no errno set) - num[5,8]: -328400 (r: 0) (no errno set) - num[5,8]: -328400 (r: 0)
(no errno set) - num[5,9]: -328400.00 (cmp: 0) (no errno set) - num[5,9]: -328400.00 (r: 0 - cmp: 0)
(no errno set) - num[5,10]: -328400.0000000 (r: 0) (no errno set) - num[5,10]: -328400.0000000 (r: 0)
(no errno set) - num[5,11]: -328400.00 (cmp: 0) (no errno set) - num[5,11]: -328400.00 (r: 0 - cmp: 0)
(no errno set) - num[5,12]: - (r: 0)
(no errno set) - num[5,13]: -328400.00 (r: 0 - cmp: 0)
(no errno set) - endptr of 6 is not NULL (no errno set) - endptr of 6 is not NULL
(no errno set) - num[6,1]: 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002 (no errno set) - num[6,1]: 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002
...@@ -78,10 +90,12 @@ ...@@ -78,10 +90,12 @@
(no errno set) - num[6,4]: 0.00 (no errno set) - num[6,4]: 0.00
(no errno set) - num[6,5]: 0.00 (no errno set) - num[6,5]: 0.00
(no errno set) - num[6,6]: 0 (r: 0) (no errno set) - num[6,6]: 0 (r: 0)
(no errno set) - num[6,7]: 0.00 (cmp: 1) (no errno set) - num[6,7]: 0.00 (r: 0 - cmp: 1)
(no errno set) - num[6,8]: 0 (r: 0) (no errno set) - num[6,8]: 0 (r: 0)
(no errno set) - num[6,9]: 0.00 (cmp: 1) (no errno set) - num[6,9]: 0.00 (r: 0 - cmp: 1)
(errno == PGTYPES_NUM_OVERFLOW) - num[6,10]: 0.0000000 (r: -1) (errno == PGTYPES_NUM_OVERFLOW) - num[6,10]: 0.0000000 (r: -1)
(errno == PGTYPES_NUM_OVERFLOW) - num[6,12]: - (r: 0)
(errno == PGTYPES_NUM_OVERFLOW) - num[6,13]: 0.00 (r: 0 - cmp: 0)
(no errno set) - endptr of 7 is not NULL (no errno set) - endptr of 7 is not NULL
(no errno set) - num[7,1]: 0.001 (no errno set) - num[7,1]: 0.001
...@@ -90,11 +104,13 @@ ...@@ -90,11 +104,13 @@
(no errno set) - num[7,4]: 0.00 (no errno set) - num[7,4]: 0.00
(no errno set) - num[7,5]: 0.00 (no errno set) - num[7,5]: 0.00
(no errno set) - num[7,6]: 0 (r: 0) (no errno set) - num[7,6]: 0 (r: 0)
(no errno set) - num[7,7]: 0.00 (cmp: 1) (no errno set) - num[7,7]: 0.00 (r: 0 - cmp: 1)
(no errno set) - num[7,8]: 0 (r: 0) (no errno set) - num[7,8]: 0 (r: 0)
(no errno set) - num[7,9]: 0.00 (cmp: 1) (no errno set) - num[7,9]: 0.00 (r: 0 - cmp: 1)
(no errno set) - num[7,10]: 0.0010000 (r: 0) (no errno set) - num[7,10]: 0.0010000 (r: 0)
(no errno set) - num[7,11]: 0.00 (cmp: 0) (no errno set) - num[7,11]: 0.00 (r: 0 - cmp: 0)
(no errno set) - num[7,12]: - (r: 0)
(no errno set) - num[7,13]: 0.00 (r: 0 - cmp: 0)
(no errno set) - endptr of 8 is not NULL (no errno set) - endptr of 8 is not NULL
(no errno set) - num[8,1]: 0.0 (no errno set) - num[8,1]: 0.0
...@@ -103,11 +119,13 @@ ...@@ -103,11 +119,13 @@
(no errno set) - num[8,4]: 0.00 (no errno set) - num[8,4]: 0.00
(no errno set) - num[8,5]: 0.00 (no errno set) - num[8,5]: 0.00
(no errno set) - num[8,6]: 0 (r: 0) (no errno set) - num[8,6]: 0 (r: 0)
(no errno set) - num[8,7]: 0.00 (cmp: 0) (no errno set) - num[8,7]: 0.00 (r: 0 - cmp: 0)
(no errno set) - num[8,8]: 0 (r: 0) (no errno set) - num[8,8]: 0 (r: 0)
(no errno set) - num[8,9]: 0.00 (cmp: 0) (no errno set) - num[8,9]: 0.00 (r: 0 - cmp: 0)
(no errno set) - num[8,10]: 0.0000000 (r: 0) (no errno set) - num[8,10]: 0.0000000 (r: 0)
(no errno set) - num[8,11]: 0.00 (cmp: 0) (no errno set) - num[8,11]: 0.00 (r: 0 - cmp: 0)
(no errno set) - num[8,12]: - (r: 0)
(no errno set) - num[8,13]: 0.00 (r: 0 - cmp: 0)
(no errno set) - endptr of 9 is not NULL (no errno set) - endptr of 9 is not NULL
(no errno set) - num[9,1]: -0.000059249 (no errno set) - num[9,1]: -0.000059249
...@@ -116,11 +134,13 @@ ...@@ -116,11 +134,13 @@
(no errno set) - num[9,4]: -0.00 (no errno set) - num[9,4]: -0.00
(no errno set) - num[9,5]: 0.00 (no errno set) - num[9,5]: 0.00
(no errno set) - num[9,6]: 0 (r: 0) (no errno set) - num[9,6]: 0 (r: 0)
(no errno set) - num[9,7]: 0.00 (cmp: -1) (no errno set) - num[9,7]: 0.00 (r: 0 - cmp: -1)
(no errno set) - num[9,8]: 0 (r: 0) (no errno set) - num[9,8]: 0 (r: 0)
(no errno set) - num[9,9]: 0.00 (cmp: -1) (no errno set) - num[9,9]: 0.00 (r: 0 - cmp: -1)
(no errno set) - num[9,10]: -0.0000592 (r: 0) (no errno set) - num[9,10]: -0.0000592 (r: 0)
(no errno set) - num[9,11]: -0.00 (cmp: -1) (no errno set) - num[9,11]: -0.00 (r: 0 - cmp: -1)
(no errno set) - num[9,12]: - (r: 0)
(no errno set) - num[9,13]: -0.00 (r: 0 - cmp: 0)
(no errno set) - endptr of 10 is not NULL (no errno set) - endptr of 10 is not NULL
(no errno set) - num[10,1]: 0.003284 (no errno set) - num[10,1]: 0.003284
...@@ -129,11 +149,13 @@ ...@@ -129,11 +149,13 @@
(no errno set) - num[10,4]: 0.00 (no errno set) - num[10,4]: 0.00
(no errno set) - num[10,5]: 0.00 (no errno set) - num[10,5]: 0.00
(no errno set) - num[10,6]: 0 (r: 0) (no errno set) - num[10,6]: 0 (r: 0)
(no errno set) - num[10,7]: 0.00 (cmp: 1) (no errno set) - num[10,7]: 0.00 (r: 0 - cmp: 1)
(no errno set) - num[10,8]: 0 (r: 0) (no errno set) - num[10,8]: 0 (r: 0)
(no errno set) - num[10,9]: 0.00 (cmp: 1) (no errno set) - num[10,9]: 0.00 (r: 0 - cmp: 1)
(no errno set) - num[10,10]: 0.0032840 (r: 0) (no errno set) - num[10,10]: 0.0032840 (r: 0)
(no errno set) - num[10,11]: 0.00 (cmp: 0) (no errno set) - num[10,11]: 0.00 (r: 0 - cmp: 0)
(no errno set) - num[10,12]: - (r: 0)
(no errno set) - num[10,13]: 0.00 (r: 0 - cmp: 0)
(no errno set) - endptr of 11 is not NULL (no errno set) - endptr of 11 is not NULL
(no errno set) - num[11,1]: 0.500001 (no errno set) - num[11,1]: 0.500001
...@@ -142,11 +164,13 @@ ...@@ -142,11 +164,13 @@
(no errno set) - num[11,4]: 0.50 (no errno set) - num[11,4]: 0.50
(no errno set) - num[11,5]: 0.00 (no errno set) - num[11,5]: 0.00
(no errno set) - num[11,6]: 1 (r: 0) (no errno set) - num[11,6]: 1 (r: 0)
(no errno set) - num[11,7]: 1.00 (cmp: -1) (no errno set) - num[11,7]: 1.00 (r: 0 - cmp: -1)
(no errno set) - num[11,8]: 1 (r: 0) (no errno set) - num[11,8]: 1 (r: 0)
(no errno set) - num[11,9]: 1.00 (cmp: -1) (no errno set) - num[11,9]: 1.00 (r: 0 - cmp: -1)
(no errno set) - num[11,10]: 0.5000010 (r: 0) (no errno set) - num[11,10]: 0.5000010 (r: 0)
(no errno set) - num[11,11]: 0.50 (cmp: 0) (no errno set) - num[11,11]: 0.50 (r: 0 - cmp: 0)
(no errno set) - num[11,12]: - (r: 0)
(no errno set) - num[11,13]: 0.50 (r: 0 - cmp: 0)
(no errno set) - endptr of 12 is not NULL (no errno set) - endptr of 12 is not NULL
(no errno set) - num[12,1]: -0.5000001 (no errno set) - num[12,1]: -0.5000001
...@@ -155,9 +179,36 @@ ...@@ -155,9 +179,36 @@
(no errno set) - num[12,4]: -0.50 (no errno set) - num[12,4]: -0.50
(no errno set) - num[12,5]: 0.00 (no errno set) - num[12,5]: 0.00
(no errno set) - num[12,6]: -1 (r: 0) (no errno set) - num[12,6]: -1 (r: 0)
(no errno set) - num[12,7]: -1.00 (cmp: 1) (no errno set) - num[12,7]: -1.00 (r: 0 - cmp: 1)
(no errno set) - num[12,8]: -1 (r: 0) (no errno set) - num[12,8]: -1 (r: 0)
(no errno set) - num[12,9]: -1.00 (cmp: 1) (no errno set) - num[12,9]: -1.00 (r: 0 - cmp: 1)
(no errno set) - num[12,10]: -0.5000001 (r: 0) (no errno set) - num[12,10]: -0.5000001 (r: 0)
(no errno set) - num[12,11]: -0.50 (cmp: -1) (no errno set) - num[12,11]: -0.50 (r: 0 - cmp: -1)
(no errno set) - num[12,12]: - (r: 0)
(no errno set) - num[12,13]: -0.50 (r: 0 - cmp: 0)
(no errno set) - endptr of 13 is not NULL
(no errno set) - num[13,1]: 1234567890123456789012345678.91
(no errno set) - num[13,2]: 1234567890123456789012345679
(no errno set) - num[13,3]: 1234567890123456789012345678.9
(no errno set) - num[13,4]: 1234567890123456789012345678.91
(no errno set) - num[13,5]: 0.00
(errno == PGTYPES_NUM_OVERFLOW) - num[13,6]: 0 (r: -1)
(errno == PGTYPES_NUM_OVERFLOW) - num[13,8]: 0 (r: -1)
(no errno set) - num[13,10]: 1234567890123456850245451776.0000000 (r: 0)
(no errno set) - num[13,11]: 1234567890123456850245451776.00 (r: 0 - cmp: -1)
(no errno set) - num[13,12]: - (r: 0)
(no errno set) - num[13,13]: 1234567890123456789012345678.91 (r: 0 - cmp: 0)
(no errno set) - endptr of 14 is not NULL
(no errno set) - num[14,1]: 1234567890123456789012345678.921
(no errno set) - num[14,2]: 1234567890123456789012345679
(no errno set) - num[14,3]: 1234567890123456789012345678.9
(no errno set) - num[14,4]: 1234567890123456789012345678.92
(no errno set) - num[14,5]: 0.00
(errno == PGTYPES_NUM_OVERFLOW) - num[14,6]: 0 (r: -1)
(errno == PGTYPES_NUM_OVERFLOW) - num[14,8]: 0 (r: -1)
(no errno set) - num[14,10]: 1234567890123456850245451776.0000000 (r: 0)
(no errno set) - num[14,11]: 1234567890123456850245451776.00 (r: 0 - cmp: -1)
(errno == PGTYPES_NUM_OVERFLOW) - num[14,12]: - (r: -1)
src/interfaces/ecpg/test/pgtypeslib/num_test2.pgc
浏览文件 @ 7c9e2c75
...@@ -6,9 +6,13 @@ ...@@ -6,9 +6,13 @@
exec sql include ../regression; exec sql include ../regression;
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", "2E-394", ".1E-2", "+.0", "-592.49E-07", "+32.84e-4",
".500001", "-.5000001", ".500001", "-.5000001",
"1234567890123456789012345678.91", /* 30 digits should fit
into decimal */
"1234567890123456789012345678.921", /* 31 digits should NOT
fit into decimal */
NULL}; NULL};
...@@ -21,8 +25,9 @@ main(void) ...@@ -21,8 +25,9 @@ main(void)
char *text="error\n"; char *text="error\n";
char *endptr; char *endptr;
numeric *num, *nin; numeric *num, *nin;
decimal *dec;
long l; long l;
int i, r, k; int i, q, r, k;
double d; double d;
ECPGdebug(1, stderr); ECPGdebug(1, stderr);
...@@ -61,8 +66,9 @@ main(void) ...@@ -61,8 +66,9 @@ main(void)
r = PGTYPESnumeric_from_long(l, nin); r = PGTYPESnumeric_from_long(l, nin);
check_errno(); check_errno();
text = PGTYPESnumeric_to_asc(nin, 2); text = PGTYPESnumeric_to_asc(nin, 2);
r = PGTYPESnumeric_cmp(num, nin); q = PGTYPESnumeric_cmp(num, nin);
printf("num[%d,7]: %s (cmp: %d)\n", i, text, r); free(text); printf("num[%d,7]: %s (r: %d - cmp: %d)\n", i, text, r, q);
free(text);
} }
r = PGTYPESnumeric_to_int(num, &k); r = PGTYPESnumeric_to_int(num, &k);
...@@ -73,8 +79,9 @@ main(void) ...@@ -73,8 +79,9 @@ main(void)
r = PGTYPESnumeric_from_int(k, nin); r = PGTYPESnumeric_from_int(k, nin);
check_errno(); check_errno();
text = PGTYPESnumeric_to_asc(nin, 2); text = PGTYPESnumeric_to_asc(nin, 2);
r = PGTYPESnumeric_cmp(num, nin); q = PGTYPESnumeric_cmp(num, nin);
printf("num[%d,9]: %s (cmp: %d)\n", i, text, r); free(text); printf("num[%d,9]: %s (r: %d - cmp: %d)\n", i, text, r, q);
free(text);
} }
r = PGTYPESnumeric_to_double(num, &d); r = PGTYPESnumeric_to_double(num, &d);
...@@ -85,11 +92,28 @@ main(void) ...@@ -85,11 +92,28 @@ main(void)
r = PGTYPESnumeric_from_double(d, nin); r = PGTYPESnumeric_from_double(d, nin);
check_errno(); check_errno();
text = PGTYPESnumeric_to_asc(nin, 2); text = PGTYPESnumeric_to_asc(nin, 2);
r = PGTYPESnumeric_cmp(num, nin); q = PGTYPESnumeric_cmp(num, nin);
printf("num[%d,11]: %s (cmp: %d)\n", i, text, r); free(text); 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); PGTYPESnumeric_free(nin);
printf("\n"); printf("\n");
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或