clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.php.net/repository/php-src

Browse Source
This commit is contained in:
Xinchen Hui 2015-01-05 22:21:56 +08:00
commit 411980a8bc
5 changed files with 229 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/pdo_mysql/mysql_driver.c
View File

@ -463,6 +463,7 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
ZVAL_LONG(return_value, H->buffered);
break;
case PDO_ATTR_EMULATE_PREPARES:
case PDO_MYSQL_ATTR_DIRECT_QUERY:
ZVAL_LONG(return_value, H->emulate_prepare);
break;

101
ext/pdo_mysql/tests/bug68371.phpt Normal file
View File

@ -0,0 +1,101 @@
--TEST--
PDO MySQL Bug #38671 (PDO#getAttribute() cannot be called with platform-specific attribute names)
--SKIPIF--
<?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
MySQLPDOTest::skip();
?>
--FILE--
<?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
$pdo = MySQLPDOTest::factory();
$pdo->setAttribute (\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
$attrs = array(
// Extensive test: default value and set+get values
PDO::ATTR_EMULATE_PREPARES => array(null, 1, 0),
PDO::MYSQL_ATTR_DIRECT_QUERY => array(null, 0, 1),
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => array(null, 0, 1),
// Just test the default
PDO::ATTR_AUTOCOMMIT => array(null),
PDO::ATTR_PREFETCH => array(null),
PDO::ATTR_TIMEOUT => array(null),
PDO::ATTR_ERRMODE => array(null),
PDO::ATTR_SERVER_VERSION => array(null),
PDO::ATTR_CLIENT_VERSION => array(null),
PDO::ATTR_SERVER_INFO => array(null),
PDO::ATTR_CONNECTION_STATUS => array(null),
PDO::ATTR_CASE => array(null),
PDO::ATTR_CURSOR_NAME => array(null),
PDO::ATTR_CURSOR => array(null),
PDO::ATTR_ORACLE_NULLS => array(null),
PDO::ATTR_PERSISTENT => array(null),
PDO::ATTR_STATEMENT_CLASS => array(null),
PDO::ATTR_FETCH_TABLE_NAMES => array(null),
PDO::ATTR_FETCH_CATALOG_NAMES => array(null),
PDO::ATTR_DRIVER_NAME => array(null),
PDO::ATTR_STRINGIFY_FETCHES => array(null),
PDO::ATTR_MAX_COLUMN_LEN => array(null),
PDO::ATTR_DEFAULT_FETCH_MODE => array(null),
);
foreach ($attrs as $a => $vals) {
foreach ($vals as $v) {
try {
if (!isset($v)) {
var_dump($pdo->getAttribute($a));
} else {
$pdo->setAttribute($a, $v);
if ($pdo->getAttribute($a) === $v) {
echo "OK\n";
} else {
throw new \Exception('KO');
}
}
} catch (\Exception $e) {
if ($e->getCode() == 'IM001') {
echo "ERR\n";
} else {
echo "ERR {$e->getMessage()}\n";
}
}
}
}
?>
--EXPECTF--
int(1)
OK
OK
int(0)
OK
OK
int(1)
OK
OK
int(1)
ERR
ERR
int(2)
string(%d) "%s"
string(%d) "%s"
string(%d) "%s"
string(%d) "%s"
int(2)
ERR
ERR
int(0)
bool(false)
array(1) {
[0]=>
string(12) "PDOStatement"
}
ERR
ERR
string(5) "mysql"
ERR
ERR
int(4)

12
ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
View File

@ -50,6 +50,7 @@ MySQLPDOTest::skip();
PDO::MYSQL_ATTR_DIRECT_QUERY => 'PDO::MYSQL_ATTR_DIRECT_QUERY',
PDO::MYSQL_ATTR_INIT_COMMAND => 'PDO::MYSQL_ATTR_INIT_COMMAND',
PDO::ATTR_EMULATE_PREPARES => 'PDO::ATTR_EMULATE_PREPARES',
);
$defaults = array(
@ -163,19 +164,10 @@ MySQLPDOTest::skip();
?>
--EXPECTF--
[003] [TODO][CHANGEREQUEST] Please, lets not ignore invalid options and bail out!
[003a] Expecting default value for 'PDO::ATTR_EMULATE_PREPARES' of '1'/integer, getAttribute() reports setting ''/boolean
[003a] Expecting default value for 'PDO::MYSQL_ATTR_INIT_COMMAND' of ''/string, getAttribute() reports setting ''/boolean
Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this function: driver does not support that attribute in %s on line %d
[010] [TODO][CHANGEREQUEST] ATTR_EMULATE_PREPARES should be on
Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this function: driver does not support that attribute in %s on line %d
Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this function: driver does not support that attribute in %s on line %d
[015] PDO::ATTR_EMULATE_PREPARES should be on
[016] PDO::MYSQL_ATTR_DIRECT_QUERY should be on
Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this function: driver does not support that attribute in %s on line %d
[017] PDO::ATTR_EMULATE_PREPARES should be off
[018] PDO::MYSQL_ATTR_DIRECT_QUERY should be off
[021] Execting '1'/boolean got ''/boolean' for options 'PDO::MYSQL_ATTR_LOCAL_INFILE'
[023] Execting 'SET @a=1'/string got ''/boolean' for options 'PDO::MYSQL_ATTR_INIT_COMMAND'

13
ext/pdo_pgsql/pgsql_driver.c
View File

@ -382,6 +382,19 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
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_PGSQL_ATTR_DISABLE_PREPARES:
ZVAL_BOOL(return_value, H->disable_prepares);
break;
case PDO_ATTR_CLIENT_VERSION:
ZVAL_STRING(return_value, PG_VERSION);
break;

112
ext/pdo_pgsql/tests/bug68371.phpt Normal file
View File

@ -0,0 +1,112 @@
--TEST--
PDO PgSQL Bug #38671 (PDO#getAttribute() cannot be called with platform-specific attribute names)
--SKIPIF--
<?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
require dirname(__FILE__) . '/config.inc';
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
$pdo = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
$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::PGSQL_ATTR_DISABLE_PREPARES => array(null, true, false),
// Just test the default
PDO::ATTR_AUTOCOMMIT => array(null),
PDO::ATTR_PREFETCH => array(null),
PDO::ATTR_TIMEOUT => array(null),
PDO::ATTR_ERRMODE => array(null),
PDO::ATTR_SERVER_VERSION => array(null),
PDO::ATTR_CLIENT_VERSION => array(null),
PDO::ATTR_SERVER_INFO => array(null),
PDO::ATTR_CONNECTION_STATUS => array(null),
PDO::ATTR_CASE => array(null),
PDO::ATTR_CURSOR_NAME => array(null),
PDO::ATTR_CURSOR => array(null),
PDO::ATTR_ORACLE_NULLS => array(null),
PDO::ATTR_PERSISTENT => array(null),
PDO::ATTR_STATEMENT_CLASS => array(null),
PDO::ATTR_FETCH_TABLE_NAMES => array(null),
PDO::ATTR_FETCH_CATALOG_NAMES => array(null),
PDO::ATTR_DRIVER_NAME => array(null),
PDO::ATTR_STRINGIFY_FETCHES => array(null),
PDO::ATTR_MAX_COLUMN_LEN => array(null),
PDO::ATTR_DEFAULT_FETCH_MODE => array(null),
);
foreach ($attrs as $a => $vals) {
foreach ($vals as $v) {
try {
if (!isset($v)) {
var_dump($pdo->getAttribute($a));
} else {
$pdo->setAttribute($a, $v);
if ($pdo->getAttribute($a) === $v) {
echo "OK\n";
} else {
throw new \Exception('KO');
}
}
} catch (\Exception $e) {
if ($e->getCode() == 'IM001') {
echo "ERR\n";
} else {
echo "ERR {$e->getMessage()}\n";
}
}
}
}
?>
--EXPECTF--
Deprecated: PDO::getAttribute(): %s
bool(false)
Deprecated: PDO::setAttribute(): %s
Deprecated: PDO::getAttribute(): %s
OK
Deprecated: PDO::setAttribute(): %s
Deprecated: PDO::getAttribute(): %s
OK
bool(false)
OK
OK
bool(false)
OK
OK
ERR
ERR
ERR
int(2)
string(%d) "%s"
string(%d) "%s"
string(%d) "%s"
string(31) "%s"
int(2)
ERR
ERR
int(0)
bool(false)
array(1) {
[0]=>
string(12) "PDOStatement"
}
ERR
ERR
string(5) "pgsql"
ERR
ERR
int(4)