diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:34:05 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:34:05 +0200 |
| commit | f59bb1ac944dfaed23150ffd452ce5bca9f5f5c0 (patch) | |
| tree | d48f5d570c9f1696997aabb863507d5854e8af50 /tests/mocks/database/config/sqlite.php | |
| parent | 96ddee29ef2d2deac9bfb91f7d508efca09ee70f (diff) | |
| parent | 8ebd1b7a21dec212be7ba0be51ce671f45b389ca (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch
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', ), ), ), |