Adding schema and initial Query Builder code coverage
diff --git a/tests/codeigniter/database/query_builder/.gitkeep b/tests/codeigniter/database/query_builder/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/tests/codeigniter/database/query_builder/.gitkeep
+++ /dev/null
diff --git a/tests/mocks/autoloader.php b/tests/mocks/autoloader.php
index 2244813..f1bdb5d 100644
--- a/tests/mocks/autoloader.php
+++ b/tests/mocks/autoloader.php
@@ -62,7 +62,7 @@
elseif (strpos($class, 'CI_DB') === 0)
{
$dir = BASEPATH.'database'.DIRECTORY_SEPARATOR;
- $file = $dir.str_replace('CI_DB', 'DB', $subclass).'.php';
+ $file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php';
}
else
{
@@ -82,7 +82,7 @@
{
return FALSE;
}
- var_dump($file);
+
throw new InvalidArgumentException("Unable to load $class.");
}
diff --git a/tests/mocks/database/ci_test.sqlite b/tests/mocks/database/ci_test.sqlite
index 37ce4f8..86d868a 100755
--- a/tests/mocks/database/ci_test.sqlite
+++ b/tests/mocks/database/ci_test.sqlite
Binary files differ
diff --git a/tests/mocks/database/config/sqlite.php b/tests/mocks/database/config/sqlite.php
index c70986e..75fdacd 100644
--- a/tests/mocks/database/config/sqlite.php
+++ b/tests/mocks/database/config/sqlite.php
@@ -9,7 +9,7 @@
'username' => 'sqlite',
'password' => 'sqlite',
'database' => realpath(__DIR__.'/..').'/ci_test.sqlite',
- 'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
+ 'dbdriver' => 'sqlite3',
),
// Database configuration with failover
@@ -19,7 +19,7 @@
'username' => 'sqlite',
'password' => 'sqlite',
'database' => '../not_exists.sqlite',
- 'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
+ 'dbdriver' => 'sqlite3',
'failover' => array(
array(
'dsn' => '',
@@ -27,7 +27,7 @@
'username' => 'sqlite',
'password' => 'sqlite',
'database' => realpath(__DIR__.'/..').'/ci_testf.sqlite',
- 'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
+ 'dbdriver' => 'sqlite3',
),
),
),
diff --git a/tests/mocks/database/db/driver.php b/tests/mocks/database/db/driver.php
index 9bf5231..cb18202 100644
--- a/tests/mocks/database/db/driver.php
+++ b/tests/mocks/database/db/driver.php
@@ -33,4 +33,4 @@
}
}
-class CI_DB extends CI_DB_Driver {}
\ No newline at end of file
+class CI_DB extends Mock_Database_DB_QueryBuilder {}
\ No newline at end of file
diff --git a/tests/mocks/database/schema/.gitkeep b/tests/mocks/database/schema/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/tests/mocks/database/schema/.gitkeep
+++ /dev/null