danog/ext-pq
1
0
Fork 0
mirror of https://github.com/danog/ext-pq.git synced 2024-11-26 11:54:50 +01:00
Code Issues Projects Releases Wiki Activity

allow INT8 / TID on 32 bits

Browse Source
This commit is contained in:
Remi Collet 2014-10-18 15:15:08 +02:00
parent d4ed03032c
commit 5a5758352b
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/php_pqres.c
View File

@ -126,10 +126,9 @@ zval *php_pqres_typed_zval(php_pqres_t *res, char *val, size_t len, Oid typ TSRM
}
ZVAL_BOOL(zv, *val == 't');
break;
#if SIZEOF_LONG >= 8
case PHP_PQ_OID_INT8:
case PHP_PQ_OID_TID:
#endif
case PHP_PQ_OID_INT4:
case PHP_PQ_OID_INT2:
case PHP_PQ_OID_XID:
@ -137,7 +136,21 @@ zval *php_pqres_typed_zval(php_pqres_t *res, char *val, size_t len, Oid typ TSRM
if (!(res->auto_convert & PHP_PQRES_CONV_INT)) {
goto noconversion;
}
ZVAL_LONG(zv, zend_atol(val, len));
{
long lval;
double dval;
switch (is_numeric_string(val, len, &lval, &dval, 0)) {
case IS_LONG:
ZVAL_LONG(zv, lval);
break;
case IS_DOUBLE:
ZVAL_DOUBLE(zv, dval);
break;
default:
goto noconversion;
}
}
break;
case PHP_PQ_OID_FLOAT4: