adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making the model require database connection only wen needed or requested

Browse source
This commit is contained in:
José Lorenzo Rodríguez Urdaneta 2010-07-15 21:16:52 -04:30
parent 67612872da
commit a13be623b5
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -462,16 +462,16 @@ class Model extends Object {
$this->Behaviors = new BehaviorCollection(); $this->Behaviors = new BehaviorCollection();
if ($this->useTable !== false) { if ($this->useTable !== false) {
$this->setDataSource($ds);
if ($this->useTable === null) { if ($this->useTable === null) {
$this->useTable = Inflector::tableize($this->name); $this->useTable = Inflector::tableize($this->name);
} }
$this->setSource($this->useTable);
if ($this->displayField == null) { if ($this->displayField == null) {
$this->displayField = $this->hasField(array('title', 'name', $this->primaryKey)); $this->displayField = $this->hasField(array('title', 'name', $this->primaryKey));
} }
$this->table = $this->useTable;
$this->tableToModel[$this->table] = $this->alias;
} elseif ($this->table === false) { } elseif ($this->table === false) {
$this->table = Inflector::tableize($this->name); $this->table = Inflector::tableize($this->name);
} }
@ -785,7 +785,7 @@ class Model extends Object {
*/ */
public function setSource($tableName) { public function setSource($tableName) {
$this->setDataSource($this->useDbConfig); $this->setDataSource($this->useDbConfig);
$db = $this->getDataSource(); $db = ConnectionManager::getDataSource($this->useDbConfig);
$db->cacheSources = ($this->cacheSources && $db->cacheSources); $db->cacheSources = ($this->cacheSources && $db->cacheSources);
if ($db->isInterfaceSupported('listSources')) { if ($db->isInterfaceSupported('listSources')) {
@ -800,7 +800,6 @@ class Model extends Object {
} }
$this->table = $this->useTable = $tableName; $this->table = $this->useTable = $tableName;
$this->tableToModel[$this->table] = $this->alias; $this->tableToModel[$this->table] = $this->alias;
$this->schema();
} }
/** /**
@ -2790,7 +2789,7 @@ class Model extends Object {
if ($dataSource != null) { if ($dataSource != null) {
$this->useDbConfig = $dataSource; $this->useDbConfig = $dataSource;
} }
$db = $this->getDataSource(); $db = ConnectionManager::getDataSource($this->useDbConfig);
if (!empty($oldConfig) && isset($db->config['prefix'])) { if (!empty($oldConfig) && isset($db->config['prefix'])) {
$oldDb =& ConnectionManager::getDataSource($oldConfig); $oldDb =& ConnectionManager::getDataSource($oldConfig);
@ -2813,6 +2812,11 @@ class Model extends Object {
* @return object A DataSource object * @return object A DataSource object
*/ */
public function &getDataSource() { public function &getDataSource() {
static $configured = false;
if (!$configured && $this->useTable !== false) {
$configured = true;
$this->setSource($this->useTable);
}
return ConnectionManager::getDataSource($this->useDbConfig); return ConnectionManager::getDataSource($this->useDbConfig);
} }

11
cake/tests/cases/libs/model/model_write.test.php
View file

@ -2961,10 +2961,17 @@ class ModelWriteTest extends BaseModelTest {
$db = ConnectionManager::create('mock_transaction', array( $db = ConnectionManager::create('mock_transaction', array(
'datasource' => 'MockTransactionDbo', 'datasource' => 'MockTransactionDbo',
)); ));
$db->expects($this->at(2))
->method('isInterfaceSupported')
->with('describe')
->will($this->returnValue(true));
$db->expects($this->once())
->method('describe')
->will($this->returnValue(array()));
$db->expects($this->once())->method('rollback'); $db->expects($this->once())->method('rollback');
$Post = new Post(); $Post = new Post('mock_transaction');
$Post->useDbConfig = 'mock_transaction';
$Post->validate = array( $Post->validate = array(
'title' => array('rule' => array('notEmpty')) 'title' => array('rule' => array('notEmpty'))