diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-24 00:19:30 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-24 00:19:30 +0200 |
| commit | ba456bb00ea161ff17311689cdc4bcc8657bb32d (patch) | |
| tree | a0f9297d59151bd864f193181fd9959ecdb500f8 /tests | |
| parent | 83326718132811d8b57ac8612ff50887ec0fa101 (diff) | |
| parent | 307c9bc15f2ff33222375ba53b0e9979aef35f22 (diff) | |
| download | forums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.tar forums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.tar.gz forums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.tar.bz2 forums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.tar.xz forums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.zip | |
Merge pull request #2643 from nickvergessen/ticket/12763
Ticket/12763 Do not regenerate the *_schema.sql files
* nickvergessen/ticket/12763:
[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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_connection_manager.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index 0d0f08f1f5..92e2080dba 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -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); + if (file_exists($filename)) + { + $queries = file_get_contents($filename); + $sql = phpbb_remove_comments($queries); - $sql = split_sql_file($sql, $this->dbms['DELIM']); + $sql = split_sql_file($sql, $this->dbms['DELIM']); - foreach ($sql as $query) - { - $this->pdo->exec($query); + foreach ($sql as $query) + { + $this->pdo->exec($query); + } } // Ok we have the db info go ahead and work on building the table |