diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 17:57:22 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 17:57:22 +0200 |
| commit | f0be9549ac14c49cad44b1476382aedf2a6f4af8 (patch) | |
| tree | 561c55b0db3d3908d57095601a4483a920b02736 /tests/test_framework/phpbb_test_case_helpers.php | |
| parent | 1dd02b0a916f1cd7672ffc247f09c9b6d4598d7c (diff) | |
| parent | 5496dd41ed04cf41bca15c6f9a9e9439d213100b (diff) | |
| download | forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.tar forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.tar.gz forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.tar.bz2 forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.tar.xz forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.zip | |
Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into develop-ascraeus
* github-nickvergessen/feature/sqlite3:
[feature/sqlite3] Add sqlite3 database to .gitignore
[feature/sqlite3] Use SQLite3 by default
[feature/sqlite3] Remove invalid comment
[feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries
[feature/sqlite3] Correctly recreate indexes when recreating a table
[feature/sqlite3] Fix sql_index_drop() for sqlite3
[feature/sqlite3] Remove trailing comma from column list
[feature/sqlite3] Update docblocks and function visibility
[feature/sqlite3] Add support for SQLite 3
Diffstat (limited to 'tests/test_framework/phpbb_test_case_helpers.php')
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 2f225fe7af..aba63a0498 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -104,7 +104,19 @@ class phpbb_test_case_helpers { $config = array(); - if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>=')) + + if (extension_loaded('sqlite3')) + { + $config = array_merge($config, array( + 'dbms' => 'phpbb\db\driver\sqlite3', + 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite3', // filename + 'dbport' => '', + 'dbname' => '', + 'dbuser' => '', + 'dbpasswd' => '', + )); + } + else if (extension_loaded('sqlite')) { $config = array_merge($config, array( 'dbms' => 'phpbb\db\driver\sqlite', |