archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make PDO_MYSQL_ATTR_DIRECT_QUERY a proper alias (#16935)

Browse source
This commit is contained in:
Kamil Tekiela 2024-12-26 22:26:40 +00:00 • committed by GitHub
parent 63e4e08e0d
commit f0554477ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/pdo_mysql/mysql_driver.c
View file

@ -454,7 +454,6 @@ static bool pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
((pdo_mysql_db_handle *)dbh->driver_data)->buffered = bval; ((pdo_mysql_db_handle *)dbh->driver_data)->buffered = bval;
PDO_DBG_RETURN(true); PDO_DBG_RETURN(true);
case PDO_MYSQL_ATTR_DIRECT_QUERY:
case PDO_ATTR_EMULATE_PREPARES: case PDO_ATTR_EMULATE_PREPARES:
if (!pdo_get_bool_param(&bval, val)) { if (!pdo_get_bool_param(&bval, val)) {
PDO_DBG_RETURN(false); PDO_DBG_RETURN(false);
@ -555,7 +554,6 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
break; break;
case PDO_ATTR_EMULATE_PREPARES: case PDO_ATTR_EMULATE_PREPARES:
case PDO_MYSQL_ATTR_DIRECT_QUERY:
ZVAL_BOOL(return_value, H->emulate_prepare); ZVAL_BOOL(return_value, H->emulate_prepare);
break; break;
@ -761,8 +759,6 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
zend_string *ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL, *ssl_cipher = NULL; zend_string *ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL, *ssl_cipher = NULL;
H->buffered = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1); H->buffered = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1);
H->emulate_prepare = pdo_attr_lval(driver_options,
PDO_MYSQL_ATTR_DIRECT_QUERY, H->emulate_prepare);
H->emulate_prepare = pdo_attr_lval(driver_options, H->emulate_prepare = pdo_attr_lval(driver_options,
PDO_ATTR_EMULATE_PREPARES, H->emulate_prepare); PDO_ATTR_EMULATE_PREPARES, H->emulate_prepare);

2
ext/pdo_mysql/pdo_mysql.c
View file

@ -126,7 +126,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_READ_DEFAULT_GROUP", (zend_long)PDO_MYSQL_ATTR_READ_DEFAULT_GROUP); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_READ_DEFAULT_GROUP", (zend_long)PDO_MYSQL_ATTR_READ_DEFAULT_GROUP);
#endif #endif
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_COMPRESS", (zend_long)PDO_MYSQL_ATTR_COMPRESS); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_COMPRESS", (zend_long)PDO_MYSQL_ATTR_COMPRESS);
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_DIRECT_QUERY", (zend_long)PDO_MYSQL_ATTR_DIRECT_QUERY); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_DIRECT_QUERY", (zend_long)PDO_ATTR_EMULATE_PREPARES);
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_FOUND_ROWS", (zend_long)PDO_MYSQL_ATTR_FOUND_ROWS); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_FOUND_ROWS", (zend_long)PDO_MYSQL_ATTR_FOUND_ROWS);
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_IGNORE_SPACE", (zend_long)PDO_MYSQL_ATTR_IGNORE_SPACE); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_IGNORE_SPACE", (zend_long)PDO_MYSQL_ATTR_IGNORE_SPACE);
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_KEY", (zend_long)PDO_MYSQL_ATTR_SSL_KEY); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_KEY", (zend_long)PDO_MYSQL_ATTR_SSL_KEY);

2
ext/pdo_mysql/pdo_mysql.stub.php
View file

@ -33,7 +33,7 @@ class Mysql extends \PDO
/** @cvalue PDO_MYSQL_ATTR_COMPRESS */ /** @cvalue PDO_MYSQL_ATTR_COMPRESS */
public const int ATTR_COMPRESS = UNKNOWN; public const int ATTR_COMPRESS = UNKNOWN;
/** @cvalue PDO_MYSQL_ATTR_DIRECT_QUERY */ /** @cvalue PDO_ATTR_EMULATE_PREPARES */
public const int ATTR_DIRECT_QUERY = UNKNOWN; public const int ATTR_DIRECT_QUERY = UNKNOWN;
/** @cvalue PDO_MYSQL_ATTR_FOUND_ROWS */ /** @cvalue PDO_MYSQL_ATTR_FOUND_ROWS */

4
ext/pdo_mysql/pdo_mysql_arginfo.h generated
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* This is a generated file, edit the .stub.php file instead.
* Stub hash: 05487a0b7668688c1885a14a8ce02493b96f63bb */ * Stub hash: 9d2c0327499693f1ca2825a9ad42ad769f44a24a */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Pdo_Mysql_getWarningCount, 0, 0, IS_LONG, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Pdo_Mysql_getWarningCount, 0, 0, IS_LONG, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
@ -67,7 +67,7 @@ static zend_class_entry *register_class_Pdo_Mysql(zend_class_entry *class_entry_
zend_string_release(const_ATTR_COMPRESS_name); zend_string_release(const_ATTR_COMPRESS_name);
zval const_ATTR_DIRECT_QUERY_value; zval const_ATTR_DIRECT_QUERY_value;
ZVAL_LONG(&const_ATTR_DIRECT_QUERY_value, PDO_MYSQL_ATTR_DIRECT_QUERY); ZVAL_LONG(&const_ATTR_DIRECT_QUERY_value, PDO_ATTR_EMULATE_PREPARES);
zend_string *const_ATTR_DIRECT_QUERY_name = zend_string_init_interned("ATTR_DIRECT_QUERY", sizeof("ATTR_DIRECT_QUERY") - 1, 1); zend_string *const_ATTR_DIRECT_QUERY_name = zend_string_init_interned("ATTR_DIRECT_QUERY", sizeof("ATTR_DIRECT_QUERY") - 1, 1);
zend_declare_typed_class_constant(class_entry, const_ATTR_DIRECT_QUERY_name, &const_ATTR_DIRECT_QUERY_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG)); zend_declare_typed_class_constant(class_entry, const_ATTR_DIRECT_QUERY_name, &const_ATTR_DIRECT_QUERY_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
zend_string_release(const_ATTR_DIRECT_QUERY_name); zend_string_release(const_ATTR_DIRECT_QUERY_name);

1
ext/pdo_mysql/php_pdo_mysql_int.h
View file

@ -167,7 +167,6 @@ enum {
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, PDO_MYSQL_ATTR_MAX_BUFFER_SIZE,
#endif #endif
PDO_MYSQL_ATTR_COMPRESS, PDO_MYSQL_ATTR_COMPRESS,
PDO_MYSQL_ATTR_DIRECT_QUERY,
PDO_MYSQL_ATTR_FOUND_ROWS, PDO_MYSQL_ATTR_FOUND_ROWS,
PDO_MYSQL_ATTR_IGNORE_SPACE, PDO_MYSQL_ATTR_IGNORE_SPACE,
PDO_MYSQL_ATTR_SSL_KEY, PDO_MYSQL_ATTR_SSL_KEY,

6
ext/pdo_mysql/tests/bug68371.phpt
View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
PDO MySQL Bug #38671 (PDO#getAttribute() cannot be called with platform-specific attribute names) PDO MySQL Bug #68371 (PDO#getAttribute() cannot be called with platform-specific attribute names)
--EXTENSIONS-- --EXTENSIONS--
pdo_mysql pdo_mysql
--SKIPIF-- --SKIPIF--
@ -16,7 +16,6 @@ $pdo->setAttribute (\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
$attrs = [ $attrs = [
// Extensive test: default value and set+get values // Extensive test: default value and set+get values
PDO::ATTR_EMULATE_PREPARES => array(null, true, false), PDO::ATTR_EMULATE_PREPARES => array(null, true, false),
PDO::MYSQL_ATTR_DIRECT_QUERY => array(null, false, true),
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => array(null, false, true), PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => array(null, false, true),
// Just test the default // Just test the default
@ -70,9 +69,6 @@ foreach ($attrs as $a => $vals) {
bool(true) bool(true)
OK OK
OK OK
bool(false)
OK
OK
bool(true) bool(true)
OK OK
OK OK