summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2015-01-05 11:00:11 +0100
committerMatteo Beccati <mbeccati@php.net>2015-01-05 11:00:11 +0100
commit3de6f80ff5859a6674f69d6e2d63ef7e16ae4531 (patch)
tree895c182b72e2d82cc2c6eae795a2cd27d03968c9
parent488d3dac2e7d77223efb3bd4748e14e5b6be0156 (diff)
downloadphp-git-3de6f80ff5859a6674f69d6e2d63ef7e16ae4531.tar.gz
Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
-rw-r--r--ext/pdo_pgsql/pgsql_driver.c4
-rw-r--r--ext/pdo_pgsql/tests/bug68371.phpt6
2 files changed, 9 insertions, 1 deletions
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index 5a78abfb61..557d57131f 100644
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -388,6 +388,10 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t *dbh, long attr, zval *return_value
ZVAL_BOOL(return_value, H->disable_native_prepares);
break;
+ case PDO_PGSQL_ATTR_DISABLE_PREPARES:
+ ZVAL_BOOL(return_value, H->disable_prepares);
+ break;
+
case PDO_ATTR_CLIENT_VERSION:
ZVAL_STRING(return_value, PG_VERSION, 1);
break;
diff --git a/ext/pdo_pgsql/tests/bug68371.phpt b/ext/pdo_pgsql/tests/bug68371.phpt
index a79da2af69..d599fda7c8 100644
--- a/ext/pdo_pgsql/tests/bug68371.phpt
+++ b/ext/pdo_pgsql/tests/bug68371.phpt
@@ -17,7 +17,8 @@ $pdo->setAttribute (\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
$attrs = array(
// Extensive test: default value and set+get values
PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT => array(null, true, false),
- PDO::ATTR_EMULATE_PREPARES => array(null, true, false),
+ PDO::ATTR_EMULATE_PREPARES => array(null, true, false),
+ PDO::PGSQL_ATTR_DISABLE_PREPARES => array(null, true, false),
// Just test the default
PDO::ATTR_AUTOCOMMIT => array(null),
@@ -82,6 +83,9 @@ OK
bool(false)
OK
OK
+bool(false)
+OK
+OK
ERR
ERR
ERR