Permalink
Browse files

Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc

  • Loading branch information...
2 parents 2e8bbd5 + fd6538f commit 4ec75c60522e7a97c733a879103840022b3f6588 @renan renan committed Sep 10, 2009
@@ -2020,7 +2020,6 @@ function find($conditions = null, $fields = array(), $order = null, $recursive =
list($type, $query) = array($conditions, $fields);
}
- $db =& ConnectionManager::getDataSource($this->useDbConfig);
$this->findQueryType = $type;
$this->id = $this->getID();
@@ -2067,6 +2066,9 @@ function find($conditions = null, $fields = array(), $order = null, $recursive =
}
}
+ if (!$db =& ConnectionManager::getDataSource($this->useDbConfig)) {
+ return false;
+ }
$results = $db->read($this, $query);
$this->resetAssociations();
$this->findQueryType = null;
@@ -4877,6 +4877,22 @@ function testCallbackDisabling() {
$this->assertEqual($result, $expected);
}
+ /**
+ * Tests that the database configuration assigned to the model can be changed using
+ * (before|after)Find callbacks
+ *
+ * @return void
+ */
+ function testCallbackSourceChange() {
+ $this->loadFixtures('Post');
+ $TestModel = new Post();
+ $this->assertEqual(3, count($TestModel->find('all')));
+
+ $this->expectError(new PatternExpectation('/Non-existent data source foo/i'));
+ $this->expectError(new PatternExpectation('/Only variable references/i'));
+ $this->assertFalse($TestModel->find('all', array('connection' => 'foo')));
+ }
+
/**
* testMultipleBelongsToWithSameClass method
*
@@ -857,6 +857,18 @@ class Post extends CakeTestModel {
* @access public
*/
var $belongsTo = array('Author');
+
+ function beforeFind($queryData) {
+ if (isset($queryData['connection'])) {
+ $this->useDbConfig = $queryData['connection'];
+ }
+ return true;
+ }
+
+ function afterFind($results) {
+ $this->useDbConfig = 'test_suite';
+ return $results;
+ }
}
/**

0 comments on commit 4ec75c6

Please sign in to comment.