diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-04-02 18:29:08 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-04-02 18:29:08 +0200 |
| commit | 43774ef423d205250181c7413585ecd4d9ad6388 (patch) | |
| tree | 08873b0817c813ec921d39ea17ad6794b7b7ef66 /tests/test_framework | |
| parent | a2545d1203f694c3096d1e70e507243061dd95e7 (diff) | |
| parent | 4a2a84d7a2d024c8ada93a7b23a8ef01141656b8 (diff) | |
| download | forums-43774ef423d205250181c7413585ecd4d9ad6388.tar forums-43774ef423d205250181c7413585ecd4d9ad6388.tar.gz forums-43774ef423d205250181c7413585ecd4d9ad6388.tar.bz2 forums-43774ef423d205250181c7413585ecd4d9ad6388.tar.xz forums-43774ef423d205250181c7413585ecd4d9ad6388.zip | |
Merge branch 'feature/dbal-tests' into develop-olympus
* feature/dbal-tests:
[feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.
[feature/dbal-tests] Fix mysql (not mysqli) dbal test.
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_case.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index a80f03b749..d558874c6f 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -122,12 +122,13 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test $pdo->exec('CREATE DATABASE ' . $database_config['dbname']); - $pdo = new PDO('mysql:host=' . $database_config['dbhost'] . ';dbname=' . $database_config['dbname'], $database_config['dbuser'], $database_config['dbpasswd']); + $pdo = new PDO($dbms_data['PDO'] . ':host=' . $database_config['dbhost'] . ';dbname=' . $database_config['dbname'], $database_config['dbuser'], $database_config['dbpasswd']); if ($database_config['dbms'] == 'mysql') { - $pdo->exec('SELECT VERSION() AS version'); + $sth = $pdo->query('SELECT VERSION() AS version'); $row = $sth->fetch(PDO::FETCH_ASSOC); + if (version_compare($row['version'], '4.1.3', '>=')) { $dbms_data['SCHEMA'] .= '_41'; @@ -136,7 +137,8 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test { $dbms_data['SCHEMA'] .= '_40'; } - unset($row); + + unset($row, $sth); } $sql_query = $this->split_sql_file(file_get_contents("../phpBB/install/schemas/{$dbms_data['SCHEMA']}_schema.sql"), $dbms_data['DELIM']); |