Fix cachefiles being generated with "

Cache files with SQLite should not contain " Fixes #2323
cakephp · Dec 1, 2011 · 49708ec · 49708ec
1 parent 65b87af
commit 49708ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/Cake/Model/Datasource/Database/Sqlite.php b/lib/Cake/Model/Datasource/Database/Sqlite.php
@@ -165,7 +165,7 @@ public function describe($model) {
 		if ($cache != null) {
 			return $cache;
 		}
-		$table = $this->fullTableName($model);
+		$table = $this->fullTableName($model, false);
 		$fields = array();
 		$result = $this->_execute('PRAGMA table_info(' . $table . ')');
 

diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
@@ -262,6 +262,10 @@ public function testBuildColumn() {
 	public function testDescribe() {
 		$this->loadFixtures('User');
 		$Model = new Model(array('name' => 'User', 'ds' => 'test', 'table' => 'users'));
+
+		$this->Dbo->cacheSources = true;
+		Configure::write('Cache.disable', false);
+
 		$result = $this->Dbo->describe($Model);
 		$expected = array(
 			'id' => array(
@@ -300,6 +304,9 @@ public function testDescribe() {
 
 		$result = $this->Dbo->describe($Model->useTable);
 		$this->assertEquals($expected, $result);
+
+		$result = Cache::read('test_users', '_cake_model_');
+		$this->assertEquals($expected, $result);
 	}
 
 /**