diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
| commit | 042766bac61958a21ba5d6b3c53b0e4296fdcce7 (patch) | |
| tree | df9e26699ddb5d3841a0d1cc1795913c819bf611 /tests/mocks/database/config/sqlite.php | |
| parent | 0688ac9ad88a03f1c56cfcd9e3c475b83301344d (diff) | |
| parent | 61318a2c53c13a314f483fcbbfd64c6e01f5242c (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-cleanup
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', ), ), ), |