adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing issue in schema when model does not use a table. updating cache test to properly test Cache::set()

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7592 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-09-11 13:35:11 +00:00
parent 0df14f183f
commit 970ef7dc56
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/schema.php
View file

@ -205,7 +205,7 @@ class CakeSchema extends Object {
$Object =& ClassRegistry::init(array('class' => $model, 'ds' => $connection)); $Object =& ClassRegistry::init(array('class' => $model, 'ds' => $connection));
} }
if (is_object($Object)) { if (is_object($Object) && $Object->useTable !== false) {
$Object->setDataSource($connection); $Object->setDataSource($connection);
$table = $db->fullTableName($Object, false); $table = $db->fullTableName($Object, false);

13
cake/tests/cases/libs/cache.test.php
View file

@ -159,24 +159,17 @@ class CacheTest extends CakeTestCase {
Cache::set(array('duration' => '+1 year')); Cache::set(array('duration' => '+1 year'));
$data = Cache::read('test_cache'); $data = Cache::read('test_cache');
if($data === false) { $this->assertFalse($data);
$data = 'this is just a simple test of the cache system'; $data = 'this is just a simple test of the cache system';
$write = Cache::write('test_cache', $data); $write = Cache::write('test_cache', $data);
}
$this->assertTrue($write); $this->assertTrue($write);
$write = false;
Cache::set(array('duration' => '+1 year')); Cache::set(array('duration' => '+1 year'));
$data = Cache::read('test_cache'); $data = Cache::read('test_cache');
if($data === false) {
$data = 'this is just a simple test of the cache system';
$write = Cache::write('test_cache', $data);
}
$this->assertFalse($write); $this->assertEqual($data, 'this is just a simple test of the cache system');
Cache::delete('test_cache'); Cache::delete('test_cache');