Skip to content

Commit e0aadc1

Browse files
SakiTakamachiGirgias
SakiTakamachi
authored and
Girgias
committed
Fix phpGH-11587 PDO::ATTR_STRINGIFY_FETCHES should return strings even in if PDO::ATTR_EMULATE_PREPARES is enabled
This also includes a fix for the MySQL ND driver to actually respect the user decided behaviour. Closes phpGH-11622 Signed-off-by: George Peter Banyard <girgias@php.net>
1 parent 5c26258 commit e0aadc1

File tree

4 files changed

+189
-6
lines changed

4 files changed

+189
-6
lines changed

‎NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ PHP NEWS
5656
- PCRE:
5757
. Mangle PCRE regex cache key with JIT option. (mvorisek)
5858

59+
- PDO:
60+
. Fix GH-11587 (After php8.1, when PDO::ATTR_EMULATE_PREPARES is true
61+
and PDO::ATTR_STRINGIFY_FETCHES is true, decimal zeros are no longer
62+
filled). (SakiTakamachi)
63+
5964
- PDO SQLite:
6065
. Fix GH-11492 (Make test failure: ext/pdo_sqlite/tests/bug_42589.phpt).
6166
(KapitanOczywisty, CViniciusSDias)

‎ext/pdo/pdo_dbh.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,9 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /
792792
return false;
793793
}
794794
dbh->stringify = bval;
795+
if (dbh->methods->set_attribute) {
796+
dbh->methods->set_attribute(dbh, attr, value);
797+
}
795798
return true;
796799

797800
case PDO_ATTR_STATEMENT_CLASS: {

‎ext/pdo_mysql/mysql_driver.c

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ static bool pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
417417
switch (attr) {
418418
case PDO_ATTR_AUTOCOMMIT:
419419
if (!pdo_get_bool_param(&bval, val)) {
420-
return false;
420+
PDO_DBG_RETURN(false);
421421
}
422422
/* ignore if the new value equals the old one */
423423
if (dbh->auto_commit ^ bval) {
@@ -437,7 +437,7 @@ static bool pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
437437

438438
case PDO_MYSQL_ATTR_USE_BUFFERED_QUERY:
439439
if (!pdo_get_bool_param(&bval, val)) {
440-
return false;
440+
PDO_DBG_RETURN(false);
441441
}
442442
/* ignore if the new value equals the old one */
443443
((pdo_mysql_db_handle *)dbh->driver_data)->buffered = bval;
@@ -446,20 +446,32 @@ static bool pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
446446
case PDO_MYSQL_ATTR_DIRECT_QUERY:
447447
case PDO_ATTR_EMULATE_PREPARES:
448448
if (!pdo_get_bool_param(&bval, val)) {
449-
return false;
449+
PDO_DBG_RETURN(false);
450450
}
451451
/* ignore if the new value equals the old one */
452452
((pdo_mysql_db_handle *)dbh->driver_data)->emulate_prepare = bval;
453453
PDO_DBG_RETURN(true);
454454

455455
case PDO_ATTR_FETCH_TABLE_NAMES:
456456
if (!pdo_get_bool_param(&bval, val)) {
457-
return false;
457+
PDO_DBG_RETURN(false);
458458
}
459459
((pdo_mysql_db_handle *)dbh->driver_data)->fetch_table_names = bval;
460460
PDO_DBG_RETURN(true);
461461

462-
#ifndef PDO_USE_MYSQLND
462+
#ifdef PDO_USE_MYSQLND
463+
case PDO_ATTR_STRINGIFY_FETCHES:
464+
if (!pdo_get_bool_param(&bval, val)) {
465+
PDO_DBG_RETURN(false);
466+
}
467+
unsigned int int_and_float_native = !bval;
468+
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
469+
if (mysql_options(H->server, MYSQLND_OPT_INT_AND_FLOAT_NATIVE, (const char *) &int_and_float_native)) {
470+
pdo_mysql_error(dbh);
471+
PDO_DBG_RETURN(false);
472+
}
473+
PDO_DBG_RETURN(true);
474+
#else
463475
case PDO_MYSQL_ATTR_MAX_BUFFER_SIZE:
464476
if (!pdo_get_long_param(&lval, val)) {
465477
PDO_DBG_RETURN(false);
@@ -891,7 +903,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
891903
}
892904

893905
#ifdef PDO_USE_MYSQLND
894-
unsigned int int_and_float_native = 1;
906+
unsigned int int_and_float_native = !pdo_attr_lval(driver_options, PDO_ATTR_STRINGIFY_FETCHES, dbh->stringify);
895907
if (mysql_options(H->server, MYSQLND_OPT_INT_AND_FLOAT_NATIVE, (const char *) &int_and_float_native)) {
896908
pdo_mysql_error(dbh);
897909
goto cleanup;

‎ext/pdo_mysql/tests/gh-11587.phpt

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
--TEST--
2+
GH-11587 PHP8.1: Fixed the condition for result set values to be of native type, making it compatible with previous versions. #11622
3+
--EXTENSIONS--
4+
pdo_mysql
5+
--SKIPIF--
6+
<?php
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
8+
MySQLPDOTest::skip();
9+
if (!extension_loaded('mysqlnd')) die('skip: This test requires the loading of mysqlnd');
10+
?>
11+
--FILE--
12+
<?php
13+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
14+
$db = MySQLPDOTest::factory();
15+
16+
$db->exec('DROP TABLE IF EXISTS test');
17+
18+
$createTestTable = <<<SQL
19+
CREATE TABLE test(
20+
id INT,
21+
`float_col` FLOAT(3,2) DEFAULT NULL,
22+
`double_col` DOUBLE(3,2) DEFAULT NULL,
23+
`decimal_col` DECIMAL(3,2) DEFAULT NULL
24+
)
25+
SQL;
26+
27+
$db->exec($createTestTable);
28+
29+
$insertTestTable = <<<SQL
30+
INSERT INTO test(id, float_col, double_col, decimal_col) VALUES(1, 2.60, 3.60, 4.60)
31+
SQL;
32+
33+
$db->exec($insertTestTable);
34+
35+
echo "PDO::ATTR_EMULATE_PREPARES = true, PDO::ATTR_STRINGIFY_FETCHES = true\n";
36+
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
37+
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
38+
$results = $db->query('SELECT * FROM test');
39+
foreach ($results as $result) {
40+
var_dump($result);
41+
}
42+
43+
echo "\n";
44+
45+
echo "PDO::ATTR_EMULATE_PREPARES = true, PDO::ATTR_STRINGIFY_FETCHES = false\n";
46+
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
47+
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
48+
$results = $db->query('SELECT * FROM test');
49+
foreach ($results as $result) {
50+
var_dump($result);
51+
}
52+
53+
echo "\n";
54+
55+
echo "PDO::ATTR_EMULATE_PREPARES = false, PDO::ATTR_STRINGIFY_FETCHES = true\n";
56+
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
57+
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
58+
$results = $db->query('SELECT * FROM test');
59+
foreach ($results as $result) {
60+
var_dump($result);
61+
}
62+
63+
echo "\n";
64+
65+
echo "PDO::ATTR_EMULATE_PREPARES = false, PDO::ATTR_STRINGIFY_FETCHES = false\n";
66+
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
67+
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
68+
$results = $db->query('SELECT * FROM test');
69+
foreach ($results as $result) {
70+
var_dump($result);
71+
}
72+
73+
echo "\n";
74+
75+
echo 'done!';
76+
?>
77+
--CLEAN--
78+
<?php
79+
require __DIR__ . '/mysql_pdo_test.inc';
80+
MySQLPDOTest::dropTestTable();
81+
?>
82+
--EXPECT--
83+
PDO::ATTR_EMULATE_PREPARES = true, PDO::ATTR_STRINGIFY_FETCHES = true
84+
array(8) {
85+
["id"]=>
86+
string(1) "1"
87+
[0]=>
88+
string(1) "1"
89+
["float_col"]=>
90+
string(4) "2.60"
91+
[1]=>
92+
string(4) "2.60"
93+
["double_col"]=>
94+
string(4) "3.60"
95+
[2]=>
96+
string(4) "3.60"
97+
["decimal_col"]=>
98+
string(4) "4.60"
99+
[3]=>
100+
string(4) "4.60"
101+
}
102+
103+
PDO::ATTR_EMULATE_PREPARES = true, PDO::ATTR_STRINGIFY_FETCHES = false
104+
array(8) {
105+
["id"]=>
106+
int(1)
107+
[0]=>
108+
int(1)
109+
["float_col"]=>
110+
float(2.6)
111+
[1]=>
112+
float(2.6)
113+
["double_col"]=>
114+
float(3.6)
115+
[2]=>
116+
float(3.6)
117+
["decimal_col"]=>
118+
string(4) "4.60"
119+
[3]=>
120+
string(4) "4.60"
121+
}
122+
123+
PDO::ATTR_EMULATE_PREPARES = false, PDO::ATTR_STRINGIFY_FETCHES = true
124+
array(8) {
125+
["id"]=>
126+
string(1) "1"
127+
[0]=>
128+
string(1) "1"
129+
["float_col"]=>
130+
string(3) "2.6"
131+
[1]=>
132+
string(3) "2.6"
133+
["double_col"]=>
134+
string(3) "3.6"
135+
[2]=>
136+
string(3) "3.6"
137+
["decimal_col"]=>
138+
string(4) "4.60"
139+
[3]=>
140+
string(4) "4.60"
141+
}
142+
143+
PDO::ATTR_EMULATE_PREPARES = false, PDO::ATTR_STRINGIFY_FETCHES = false
144+
array(8) {
145+
["id"]=>
146+
int(1)
147+
[0]=>
148+
int(1)
149+
["float_col"]=>
150+
float(2.6)
151+
[1]=>
152+
float(2.6)
153+
["double_col"]=>
154+
float(3.6)
155+
[2]=>
156+
float(3.6)
157+
["decimal_col"]=>
158+
string(4) "4.60"
159+
[3]=>
160+
string(4) "4.60"
161+
}
162+
163+
done!

0 commit comments

Comments
 (0)