Skip to content
Permalink
Browse files

Fixing fixture loading for sqlite

  • Loading branch information...
lorenzo committed Nov 30, 2010
1 parent 0d93520 commit 2e9283abd9976d1d57294e1a8a0e99f93faf40d4
@@ -139,9 +139,6 @@ function enabled() {
* @access public
*/
function listSources() {
$db = $this->config['database'];
$this->config['database'] = basename($this->config['database']);
$cache = parent::listSources();
if ($cache != null) {
return $cache;
@@ -157,11 +154,8 @@ function listSources() {
$tables[] = $table[0]['name'];
}
parent::listSources($tables);
$this->config['database'] = $db;
return $tables;
}
$this->config['database'] = $db;
return array();
}
@@ -44,8 +44,6 @@ class AclShellTest extends CakeTestCase {
* @return void
*/
public function setUp() {
parent::setUp();
Configure::write('Acl.database', 'test');
Configure::write('Acl.classname', 'DbAcl');
@@ -59,7 +57,6 @@ public function setUp() {
);
$collection = new ComponentCollection();
$this->Task->Acl = new AclComponent($collection);
$this->Task->params['datasource'] = 'test';
}
@@ -177,8 +177,8 @@ protected function _setupTable($fixture, $db = null, $drop = true) {
$cacheSources = $db->cacheSources;
$db->cacheSources = false;
$db->cacheSources = $cacheSources;
$sources = $db->listSources();
$db->cacheSources = $cacheSources;
$table = $db->config['prefix'] . $fixture->table;
if ($drop && in_array($table, $sources)) {

0 comments on commit 2e9283a

Please sign in to comment.
You can’t perform that action at this time.