adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #6427, default datasource not loaded when ds is specified

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8197 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2009-06-16 21:35:21 +00:00
parent a903a4527f
commit 88e0cfa2f8
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/model/model.php
View file

@ -372,6 +372,10 @@ class Model extends Overloadable {
} elseif ($table) { } elseif ($table) {
$this->useTable = $table; $this->useTable = $table;
} }
if ($ds !== null) {
$this->useDbConfig = $ds;
}
if (is_subclass_of($this, 'AppModel')) { if (is_subclass_of($this, 'AppModel')) {
$appVars = get_class_vars('AppModel'); $appVars = get_class_vars('AppModel');

27
cake/tests/cases/libs/model/model.test.php
View file

@ -268,6 +268,23 @@ class ModelTest extends CakeTestCase {
$this->assertEqual($TestModel->actsAs, $expected); $this->assertEqual($TestModel->actsAs, $expected);
$this->assertTrue(isset($TestModel->Behaviors->Containable)); $this->assertTrue(isset($TestModel->Behaviors->Containable));
} }
/**
* test Model::__construct
*
* ensure that $actsAS and $_findMethods are merged.
*
* @return void
**/
function testConstructWithAlternateDataSource() {
$TestModel =& ClassRegistry::init(array(
'class' => 'DoesntMatter', 'ds' => 'test_suite', 'table' => false
));
$this->assertEqual('test_suite', $TestModel->useDbConfig);
//deprecated but test it anyway
$NewVoid =& new TheVoid(null, false, 'other');
$this->assertEqual('other', $NewVoid->useDbConfig);
}
/** /**
* testColumnTypeFetching method * testColumnTypeFetching method
* *
@ -3655,7 +3672,7 @@ class ModelTest extends CakeTestCase {
$TestModel->create(array('name' => 'project')) && $TestModel->save(); $TestModel->create(array('name' => 'project')) && $TestModel->save();
$TestModel->create(array('name' => 'project')) && $TestModel->save(); $TestModel->create(array('name' => 'project')) && $TestModel->save();
$TestModel->create(array('name' => 'project')) && $TestModel->save(); $TestModel->create(array('name' => 'project')) && $TestModel->save();
$result = $TestModel->find('count', array('fields' => 'DISTINCT name')); $result = $TestModel->find('count', array('fields' => 'DISTINCT name'));
$this->assertEqual($result, 4); $this->assertEqual($result, 4);
} }
@ -12539,8 +12556,8 @@ class ModelTest extends CakeTestCase {
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$rows = $Thread->find('all', array( $rows = $Thread->find('all', array(
'group' => 'Thread.project_id', 'group' => 'Thread.project_id',
'fields' => array('Thread.project_id', 'COUNT(*) AS total'), 'fields' => array('Thread.project_id', 'COUNT(*) AS total'),
'order'=> 'Thread.project_id' 'order'=> 'Thread.project_id'
)); ));
$result = array(); $result = array();
@ -12617,14 +12634,14 @@ class ModelTest extends CakeTestCase {
array('Product' => array('type' => 'Toy'), array('price' => 3)) array('Product' => array('type' => 'Toy'), array('price' => 3))
); );
$result = $Product->find('all',array( $result = $Product->find('all',array(
'fields'=>array('Product.type','MIN(Product.price) as price'), 'fields'=>array('Product.type','MIN(Product.price) as price'),
'group'=> 'Product.type', 'group'=> 'Product.type',
'order' => 'Product.type ASC' 'order' => 'Product.type ASC'
)); ));
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = $Product->find('all', array( $result = $Product->find('all', array(
'fields'=>array('Product.type','MIN(Product.price) as price'), 'fields'=>array('Product.type','MIN(Product.price) as price'),
'group'=> array('Product.type'), 'group'=> array('Product.type'),
'order' => 'Product.type ASC')); 'order' => 'Product.type ASC'));
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);