com php-src: Merge branch 'PHP-5.6': ext/pdo_mysql/mysql_dr iver.c ext/pdo_pgsql/pgsql_driver.c
| From: | Matteo Beccati | Date: | Mon, 05 Jan 2015 09:48:40 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/pdo_mysql/mysql_dr iver.c ext/pdo_pgsql/pgsql_driver.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83985@lists.php.net to get a copy of this message | ||
Commit: 7d0887a229a28c465781d6e4a00c6df61112bcd5
Author: Matteo Beccati <mbeccati@php.net> Mon, 5 Jan 2015 10:48:40 +0100
Parents: c234ca8e17a844225a3ce5c64df9fdc5f39e23b9 488d3dac2e7d77223efb3bd4748e14e5b6be0156
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7d0887a229a28c465781d6e4a00c6df61112bcd5
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
Bugs:
https://bugs.php.net/68371
Changed paths:
MM ext/pdo_mysql/mysql_driver.c
MM ext/pdo_pgsql/pgsql_driver.c
Diff:
diff --cc ext/pdo_pgsql/pgsql_driver.c
index c2f744f,5a78abf..ce8f678
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@@ -382,8 -379,17 +382,17 @@@ static int pdo_pgsql_get_attribute(pdo_
pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
switch (attr) {
+ case PDO_ATTR_EMULATE_PREPARES:
+ ZVAL_BOOL(return_value, H->emulate_prepares);
+ break;
+
+ case PDO_PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT:
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED,
"PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT is deprecated, use
PDO::ATTR_EMULATE_PREPARES instead");
+ ZVAL_BOOL(return_value, H->disable_native_prepares);
+ break;
+
case PDO_ATTR_CLIENT_VERSION:
- ZVAL_STRING(return_value, PG_VERSION, 1);
+ ZVAL_STRING(return_value, PG_VERSION);
break;
case PDO_ATTR_SERVER_VERSION: