mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12763] Remove invalid comment from oracle and postgres *_schema.sql
  [ticket/12763] Remove empty schema files
  [ticket/12763] Do not regenerate the *_schema.sql files
This commit is contained in:
Andreas Fischer
2014-06-24 00:19:30 +02:00
parent c0699c88f8 ba456bb00e
commit c01ae175a6
10 changed files with 24 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/test_framework/phpbb_database_test_connection_manager.php
View File

@@ -342,14 +342,17 @@ class phpbb_database_test_connection_manager
$filename = $directory . $schema . '_schema.sql';
$queries = file_get_contents($filename);
$sql = phpbb_remove_comments($queries);
$sql = split_sql_file($sql, $this->dbms['DELIM']);
foreach ($sql as $query)
if (file_exists($filename))
{
$this->pdo->exec($query);
$queries = file_get_contents($filename);
$sql = phpbb_remove_comments($queries);
$sql = split_sql_file($sql, $this->dbms['DELIM']);
foreach ($sql as $query)
{
$this->pdo->exec($query);
}
}
// Ok we have the db info go ahead and work on building the table