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

[ticket/9592] Slight adjustments to simplify db test cases

Browse source 
PHPBB3-9592
This commit is contained in:
Igor Wiedler 2010-09-15 08:28:46 +02:00
parent 566ddf8a4b
commit a4742f795e
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/test_framework/phpbb_database_test_case.php
View file

@ -19,7 +19,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
} }
} }
function get_dbms_data($dbms) public function get_dbms_data($dbms)
{ {
$available_dbms = array( $available_dbms = array(
'firebird' => array( 'firebird' => array(
@ -79,10 +79,13 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
} }
} }
function split_sql_file($sql, $delimiter, $dbms) // NOTE: This function is not the same as split_sql_file from functions_install
public function split_sql_file($sql, $dbms)
{ {
$dbms_data = $this->get_dbms_data($dbms);
$sql = str_replace("\r" , '', $sql); $sql = str_replace("\r" , '', $sql);
$data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql); $data = preg_split('/' . preg_quote($dbms_data['DELIM'], '/') . '$/m', $sql);
$data = array_map('trim', $data); $data = array_map('trim', $data);
@ -99,13 +102,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
// trim # off query to satisfy sqlite // trim # off query to satisfy sqlite
foreach ($data as $i => $query) foreach ($data as $i => $query)
{ {
$lines = explode("\n", $query); $data[$i] = preg_replace('/^#.*$/m', "\n", $query);
foreach ($lines as $j => $line)
if (strpos($line, '#') === 0)
{
unset($lines[$j]);
}
$data[$i] = implode("\n", $lines);
} }
} }
@ -177,7 +174,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
unset($row, $sth); unset($row, $sth);
} }
$sql_query = $this->split_sql_file(file_get_contents("../phpBB/install/schemas/{$dbms_data['SCHEMA']}_schema.sql"), $dbms_data['DELIM'], $database_config['dbms']); $sql_query = $this->split_sql_file(file_get_contents("../phpBB/install/schemas/{$dbms_data['SCHEMA']}_schema.sql"), $database_config['dbms']);
foreach ($sql_query as $sql) foreach ($sql_query as $sql)
{ {