Fix #78855: Native PHP types in database fetches - float was added

Author: oleg-st

ext/pgsql/pgsql.c

@@ -79,6 +79,8 @@
 #define INT8OID     20
 #define TEXTOID     25
 #define OIDOID      26
+#define FLOAT4OID   700
+#define FLOAT8OID   701
 
 #if ZEND_LONG_MAX < UINT_MAX
 #define PGSQL_RETURN_OID(oid) do { \
@@ -2742,6 +2744,18 @@ static inline void php_pgsql_get_field_value(zval *value, PGresult *pgsql_result
 				case BOOLOID:
 					ZVAL_BOOL(value, *element == 't');
 					break;
+				case FLOAT4OID:
+				case FLOAT8OID:
+					if (element_len == sizeof("Infinity") - 1 && strcmp(element, "Infinity") == 0) {
+						ZVAL_DOUBLE(value, ZEND_INFINITY);
+					} else if (element_len == sizeof("-Infinity") - 1 && strcmp(element, "-Infinity") == 0) {
+						ZVAL_DOUBLE(value, -ZEND_INFINITY);
+					} else if (element_len == sizeof("NaN") - 1 && strcmp(element, "NaN") == 0) {
+						ZVAL_DOUBLE(value, ZEND_NAN);
+					} else {
+						ZVAL_DOUBLE(value, zend_strtod(element, NULL));
+					}
+					break;
 				case OIDOID:
 				case INT2OID:
 				case INT4OID:

ext/pgsql/tests/bug78855.phpt

@@ -12,16 +12,16 @@ include 'config.inc';
 
 $db = pg_connect($conn_str);
 
-$res = pg_query($db, "SELECT null, true, false, 1::smallint, 2::int, 3::oid, 'text', '\\x3031'::bytea");
+$res = pg_query($db, "SELECT null, true, false, 1::smallint, 2::int, 3::oid, 'text', '\\x3031'::bytea, 1.1::real, 1.2::float, 'Infinity'::float, '-Infinity'::float, 'NaN'::float");
 var_dump(pg_fetch_array($res, 0, PGSQL_NUM));
 var_dump(pg_fetch_array($res, 0, PGSQL_NUM|PGSQL_TYPED));
 
 var_dump(pg_fetch_all($res, PGSQL_NUM));
 var_dump(pg_fetch_all($res, PGSQL_NUM|PGSQL_TYPED));
 
 ?>
---EXPECTF--
-array(8) {
+--EXPECT--
+array(13) {
   [0]=>
   NULL
   [1]=>
@@ -38,8 +38,18 @@ array(8) {
   string(4) "text"
   [7]=>
   string(6) "\x3031"
+  [8]=>
+  string(3) "1.1"
+  [9]=>
+  string(3) "1.2"
+  [10]=>
+  string(8) "Infinity"
+  [11]=>
+  string(9) "-Infinity"
+  [12]=>
+  string(3) "NaN"
 }
-array(8) {
+array(13) {
   [0]=>
   NULL
   [1]=>
@@ -56,10 +66,20 @@ array(8) {
   string(4) "text"
   [7]=>
   string(2) "01"
+  [8]=>
+  float(1.1)
+  [9]=>
+  float(1.2)
+  [10]=>
+  float(INF)
+  [11]=>
+  float(-INF)
+  [12]=>
+  float(NAN)
 }
 array(1) {
   [0]=>
-  array(8) {
+  array(13) {
     [0]=>
     NULL
     [1]=>
@@ -76,11 +96,21 @@ array(1) {
     string(4) "text"
     [7]=>
     string(6) "\x3031"
+    [8]=>
+    string(3) "1.1"
+    [9]=>
+    string(3) "1.2"
+    [10]=>
+    string(8) "Infinity"
+    [11]=>
+    string(9) "-Infinity"
+    [12]=>
+    string(3) "NaN"
   }
 }
 array(1) {
   [0]=>
-  array(8) {
+  array(13) {
     [0]=>
     NULL
     [1]=>
@@ -97,5 +127,15 @@ array(1) {
     string(4) "text"
     [7]=>
     string(2) "01"
+    [8]=>
+    float(1.1)
+    [9]=>
+    float(1.2)
+    [10]=>
+    float(INF)
+    [11]=>
+    float(-INF)
+    [12]=>
+    float(NAN)
   }
 }