diff options
author | Eric Roberts <eric@cryode.com> | 2013-07-16 23:16:52 +0200 |
---|---|---|
committer | Eric Roberts <eric@cryode.com> | 2013-07-16 23:16:52 +0200 |
commit | c3db9cb2b19a61f51f62a6fa3265ef3226aad69f (patch) | |
tree | 938820118a406b170094c57a9073827f034c07a8 /tests/mocks | |
parent | 70a9a28321c5226d597bb87319524747e714b133 (diff) | |
parent | ae0cc3e868b1708067df22932c09874033a34be9 (diff) |
Merge branch 'refs/heads/develop' into update/changelog
Conflicts:
user_guide_src/source/changelog.rst
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrade_214.rst
Diffstat (limited to 'tests/mocks')
-rw-r--r-- | tests/mocks/database/db.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/mocks/database/db.php b/tests/mocks/database/db.php index 7e0030e15..968476dea 100644 --- a/tests/mocks/database/db.php +++ b/tests/mocks/database/db.php @@ -106,6 +106,7 @@ class Mock_Database_DB { $subdriver = self::$subdriver; $case->ci_vfs_create(array( 'DB_driver.php' => '', + 'DB_result.php' => '', 'DB_forge.php' => '', 'DB_query_builder.php' => '' ), '', $case->ci_base_root, 'database'); @@ -113,6 +114,7 @@ class Mock_Database_DB { { $case->ci_vfs_create(array( $driver.'_driver.php' => '', + $driver.'_result.php' => '', $driver.'_forge.php' => '' ), '', $case->ci_base_root, 'database/drivers/'.$driver); } |