From: Remi Collet <remi@php.net>
Date: Sat, 18 Oct 2014 13:15:08 +0000 (+0200)
Subject: allow INT8 / TID on 32 bits
X-Git-Tag: v0.5.3~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5a5758352bbc42cbe57f32859de831de2ea08a86;p=m6w6%2Fext-pq

allow INT8 / TID on 32 bits
---

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 9dda107..75a6081 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -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: