Permalink
Browse files

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

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8197 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
1 parent a903a45 commit 88e0cfa2f856a004d7ccb4a12d2bf4a5f5282f8f gwoo committed Jun 16, 2009
Showing with 26 additions and 5 deletions.
  1. +4 −0 cake/libs/model/model.php
  2. +22 −5 cake/tests/cases/libs/model/model.test.php
@@ -372,6 +372,10 @@ function __construct($id = false, $table = null, $ds = null) {
} elseif ($table) {
$this->useTable = $table;
}
+
+ if ($ds !== null) {
+ $this->useDbConfig = $ds;
+ }
if (is_subclass_of($this, 'AppModel')) {
$appVars = get_class_vars('AppModel');
@@ -269,6 +269,23 @@ function testConstruct() {
$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
*
* @access public
@@ -3655,7 +3672,7 @@ function testFindCountDistinct() {
$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'));
$this->assertEqual($result, 4);
}
@@ -12539,8 +12556,8 @@ function testGroupBy() {
$this->assertEqual($result, $expected);
$rows = $Thread->find('all', array(
- 'group' => 'Thread.project_id',
- 'fields' => array('Thread.project_id', 'COUNT(*) AS total'),
+ 'group' => 'Thread.project_id',
+ 'fields' => array('Thread.project_id', 'COUNT(*) AS total'),
'order'=> 'Thread.project_id'
));
$result = array();
@@ -12617,14 +12634,14 @@ function testGroupBy() {
array('Product' => array('type' => 'Toy'), array('price' => 3))
);
$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',
'order' => 'Product.type ASC'
));
$this->assertEqual($result, $expected);
$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'),
'order' => 'Product.type ASC'));
$this->assertEqual($result, $expected);

0 comments on commit 88e0cfa

Please sign in to comment.