Skip to content

Commit da550e7

Browse files
MYSQL_ATTR_USE_BUFFERED_QUERY is a bool attribute (#10320)
1 parent 38dfd20 commit da550e7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ext/pdo_mysql/mysql_driver.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
526526
break;
527527

528528
case PDO_MYSQL_ATTR_USE_BUFFERED_QUERY:
529-
ZVAL_LONG(return_value, H->buffered);
529+
ZVAL_BOOL(return_value, H->buffered);
530530
break;
531531

532532
case PDO_ATTR_EMULATE_PREPARES:

ext/pdo_mysql/tests/bug68371.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $attrs = array(
1717
// Extensive test: default value and set+get values
1818
PDO::ATTR_EMULATE_PREPARES => array(null, 1, 0),
1919
PDO::MYSQL_ATTR_DIRECT_QUERY => array(null, 0, 1),
20-
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => array(null, 0, 1),
20+
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => array(null, false, true),
2121

2222
// Just test the default
2323
PDO::ATTR_AUTOCOMMIT => array(null),
@@ -73,7 +73,7 @@ OK
7373
int(0)
7474
OK
7575
OK
76-
int(1)
76+
bool(true)
7777
OK
7878
OK
7979
int(1)

ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ MySQLPDOTest::skip();
6161
/* TODO - why is this a valid option if getAttribute() does not support it?! */
6262
PDO::ATTR_TIMEOUT => false,
6363
PDO::ATTR_EMULATE_PREPARES => 1,
64-
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => 1,
64+
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
6565
/* TODO getAttribute() does not handle it */
6666
PDO::MYSQL_ATTR_LOCAL_INFILE => false,
6767
/* TODO getAttribute() does not handle it */
@@ -144,8 +144,8 @@ MySQLPDOTest::skip();
144144
if ($db->getAttribute(PDO::MYSQL_ATTR_DIRECT_QUERY))
145145
printf("[018] PDO::MYSQL_ATTR_DIRECT_QUERY should be off\n");
146146

147-
set_option_and_check(19, PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, 1, 'PDO::MYSQL_ATTR_USE_BUFFERED_QUERY');
148-
set_option_and_check(20, PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, 0, 'PDO::MYSQL_ATTR_USE_BUFFERED_QUERY');
147+
set_option_and_check(19, PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true, 'PDO::MYSQL_ATTR_USE_BUFFERED_QUERY');
148+
set_option_and_check(20, PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false, 'PDO::MYSQL_ATTR_USE_BUFFERED_QUERY');
149149

150150
set_option_and_check(21, PDO::MYSQL_ATTR_LOCAL_INFILE, true, 'PDO::MYSQL_ATTR_LOCAL_INFILE');
151151
set_option_and_check(22, PDO::MYSQL_ATTR_LOCAL_INFILE, false, 'PDO::MYSQL_ATTR_LOCAL_INFILE');

0 commit comments

Comments
 (0)