diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:16:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:16:35 +0200 |
| commit | 87ac4260063e3a62805cc8f6f73cd2eb18da663a (patch) | |
| tree | 8a2463b964a5e7dd6aa606349a4251f70191fce1 /tests/mocks/database/config/sqlite.php | |
| parent | a58c0b695a0590aff07a42ad2ad81b544e226af9 (diff) | |
| parent | ced2c9ab41450cb632c042730604111ec2a24e1f (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlsrv
Diffstat (limited to 'tests/mocks/database/config/sqlite.php')
| -rw-r--r-- | tests/mocks/database/config/sqlite.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/mocks/database/config/sqlite.php b/tests/mocks/database/config/sqlite.php index 8665e208d..755ce2a3a 100644 --- a/tests/mocks/database/config/sqlite.php +++ b/tests/mocks/database/config/sqlite.php @@ -1,5 +1,4 @@ <?php -$dbdriver = is_php('5.4') ? 'sqlite3' : 'sqlite'; return array( @@ -10,7 +9,7 @@ return array( 'username' => 'sqlite', 'password' => 'sqlite', 'database' => realpath(__DIR__.'/..').'/ci_test.sqlite', - 'dbdriver' => $dbdriver, + 'dbdriver' => 'sqlite3', ), // Database configuration with failover @@ -20,15 +19,15 @@ return array( 'username' => 'sqlite', 'password' => 'sqlite', 'database' => '../not_exists.sqlite', - 'dbdriver' => $dbdriver, + 'dbdriver' => 'sqlite3', 'failover' => array( array( 'dsn' => '', 'hostname' => 'localhost', 'username' => 'sqlite', 'password' => 'sqlite', - 'database' => realpath(__DIR__.'/..').'/ci_testf.sqlite', - 'dbdriver' => $dbdriver, + 'database' => realpath(__DIR__.'/..').'/ci_test.sqlite', + 'dbdriver' => 'sqlite3', ), ), ), |