diff options
| author | Jouni Ahto <jah@php.net> | 2000-05-11 19:38:02 +0000 |
|---|---|---|
| committer | Jouni Ahto <jah@php.net> | 2000-05-11 19:38:02 +0000 |
| commit | 59ddaefd7239be6a2d350d138ecebb3f18de56aa (patch) | |
| tree | 4371ff3f529a4370fb839755046d4bb03f832389 /ext | |
| parent | 0d6a794d856af0c681d497101ba6536045e5911a (diff) | |
| download | php-git-59ddaefd7239be6a2d350d138ecebb3f18de56aa.tar.gz | |
SQL_INT64 binding support in prepared and executed queries.
Fixed a (probably) longtime bug with binding to DECIMAL/NUMERIC stored as
scaled integer.
# Be lazy on documentation, then nobody ever uses the features there are,
# and you never get caught for bugs...
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/interbase/interbase.c | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 09ac831839..c3f6527da5 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -1068,7 +1068,6 @@ static int _php_ibase_bind(XSQLDA *sqlda, pval **b_vars, BIND_BUF *buf) XSQLVAR *var; pval *b_var; int i; - var = sqlda->sqlvar; for (i = 0; i < sqlda->sqld; var++, i++) { /* binded vars */ @@ -1094,9 +1093,21 @@ static int _php_ibase_bind(XSQLDA *sqlda, pval **b_vars, BIND_BUF *buf) buf[i].val.sval = (short)b_var->value.lval; var->sqldata = (void ISC_FAR *)(&buf[i].val.sval); break; - case SQL_LONG: /* direct to variable */ - convert_to_long(b_var); - var->sqldata = (void ISC_FAR *)(&b_var->value.lval); + case SQL_LONG: + if (var->sqlscale < 0) { + /* + DECIMAL or NUMERIC field stored internally as scaled integer. + Coerce it to string and let InterBase's internal routines + handle it. + */ + convert_to_string(b_var); + var->sqldata = (void ISC_FAR *)b_var->value.str.val; + var->sqllen = b_var->value.str.len; + var->sqltype = SQL_TEXT; + } else { + convert_to_long(b_var); + var->sqldata = (void ISC_FAR *)(&b_var->value.lval); + } break; case SQL_FLOAT: convert_to_double(b_var); @@ -1107,8 +1118,18 @@ static int _php_ibase_bind(XSQLDA *sqlda, pval **b_vars, BIND_BUF *buf) convert_to_double(b_var); var->sqldata = (void ISC_FAR *)(&b_var->value.dval); break; - /* FIX THESE case SQL_INT64: + /* + Just let InterBase's internal routines handle it. + Besides, it might even have originally been a string + to avoid rounding errors... + */ + convert_to_string(b_var); + var->sqldata = (void ISC_FAR *)b_var->value.str.val; + var->sqllen = b_var->value.str.len; + var->sqltype = SQL_TEXT; + break; + /* FIX THESE case SQL_TIMESTAMP: case SQL_TYPE_DATE: case SQL_TYPE_TIME: @@ -1632,14 +1653,6 @@ static int _php_ibase_var_pval(pval *val, void *data, int type, int len, int sca (ISC_INT64) abs((*(ISC_INT64 *)data % (int) pow(10.0, (double) -scale)))); val->value.str.val = estrdup(string_data); break; - /* - sprintf(buf, "%Ld.%Ld", - (ISC_INT64) (q / (int) - pow(10.0, (double) -ovar->sqlscale)), - (ISC_INT64) (q % (int) - pow(10.0, (double) -ovar->sqlscale))); - */ - #endif #ifndef SQL_TIMESTAMP case SQL_DATE: |