makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'feature/dbal-tests' into develop-olympus

Browse source 
* feature/dbal-tests:
  [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.
  [feature/dbal-tests] Fix mysql (not mysqli) dbal test.
This commit is contained in:
Nils Adermann 2010-04-02 18:29:08 +02:00
commit 43774ef423
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/test_framework/phpbb_database_test_case.php
View file

@ -122,12 +122,13 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
$pdo->exec('CREATE DATABASE ' . $database_config['dbname']); $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') if ($database_config['dbms'] == 'mysql')
{ {
$pdo->exec('SELECT VERSION() AS version'); $sth = $pdo->query('SELECT VERSION() AS version');
$row = $sth->fetch(PDO::FETCH_ASSOC); $row = $sth->fetch(PDO::FETCH_ASSOC);
if (version_compare($row['version'], '4.1.3', '>=')) if (version_compare($row['version'], '4.1.3', '>='))
{ {
$dbms_data['SCHEMA'] .= '_41'; $dbms_data['SCHEMA'] .= '_41';
@ -136,7 +137,8 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
{ {
$dbms_data['SCHEMA'] .= '_40'; $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']); $sql_query = $this->split_sql_file(file_get_contents("../phpBB/install/schemas/{$dbms_data['SCHEMA']}_schema.sql"), $dbms_data['DELIM']);