diff options
| author | Matteo Beccati <mbeccati@php.net> | 2015-01-05 09:54:06 +0100 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2015-01-05 10:48:18 +0100 |
| commit | 488d3dac2e7d77223efb3bd4748e14e5b6be0156 (patch) | |
| tree | 14943cb9cc0465d5258fe91daf323461a414773f /ext/pdo_pgsql/pgsql_driver.c | |
| parent | 95183cc33918efe39098fa4adb3b3b13eaa1eee7 (diff) | |
| parent | 7d2f8525d8ec1612ad3999076e291e734fcb0568 (diff) | |
| download | php-git-488d3dac2e7d77223efb3bd4748e14e5b6be0156.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
Diffstat (limited to 'ext/pdo_pgsql/pgsql_driver.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index f347aaa0e4..5a78abfb61 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -379,6 +379,15 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t *dbh, long attr, zval *return_value 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); break; |