Fix #78855: Native PHP types in database fetches - float 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,10 @@ 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:
+					ZVAL_DOUBLE(value, zend_strtod(element, NULL));
+					break;
 				case OIDOID:
 				case INT2OID:
 				case INT4OID:

ext/pgsql/tests/bug78855.phpt

@@ -12,7 +12,7 @@ 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, 1.1::real, 1.2::float, 'text', '\\x3031'::bytea");
 var_dump(pg_fetch_array($res, 0, PGSQL_NUM));
 var_dump(pg_fetch_array($res, 0, PGSQL_NUM|PGSQL_TYPED));
 
@@ -21,7 +21,7 @@ var_dump(pg_fetch_all($res, PGSQL_NUM|PGSQL_TYPED));
 
 ?>
 --EXPECTF--
-array(8) {
+array(10) {
   [0]=>
   NULL
   [1]=>
@@ -35,11 +35,15 @@ array(8) {
   [5]=>
   string(1) "3"
   [6]=>
-  string(4) "text"
+  string(3) "1.1"
   [7]=>
+  string(3) "1.2"
+  [8]=>
+  string(4) "text"
+  [9]=>
   string(6) "\x3031"
 }
-array(8) {
+array(10) {
   [0]=>
   NULL
   [1]=>
@@ -53,13 +57,17 @@ array(8) {
   [5]=>
   int(3)
   [6]=>
-  string(4) "text"
+  float(1.1)
   [7]=>
+  float(1.2)
+  [8]=>
+  string(4) "text"
+  [9]=>
   string(2) "01"
 }
 array(1) {
   [0]=>
-  array(8) {
+  array(10) {
     [0]=>
     NULL
     [1]=>
@@ -73,14 +81,18 @@ array(1) {
     [5]=>
     string(1) "3"
     [6]=>
-    string(4) "text"
+    string(3) "1.1"
     [7]=>
+    string(3) "1.2"
+    [8]=>
+    string(4) "text"
+    [9]=>
     string(6) "\x3031"
   }
 }
 array(1) {
   [0]=>
-  array(8) {
+  array(10) {
     [0]=>
     NULL
     [1]=>
@@ -94,8 +106,12 @@ array(1) {
     [5]=>
     int(3)
     [6]=>
-    string(4) "text"
+    float(1.1)
     [7]=>
+    float(1.2)
+    [8]=>
+    string(4) "text"
+    [9]=>
     string(2) "01"
   }
 }