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 DataSource calls for PHP4

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3429 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-08-25 00:43:48 +00:00
parent eff03b1dea
commit 554b4ceb42
1 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -430,7 +430,7 @@ class Model extends Overloadable {
* @access protected * @access protected
*/ */
function __call__($method, $params) { function __call__($method, $params) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
$methods = array_keys($this->__behaviorMethods); $methods = array_keys($this->__behaviorMethods);
$call = array_values($this->__behaviorMethods); $call = array_values($this->__behaviorMethods);
@ -633,7 +633,7 @@ class Model extends Overloadable {
* @param string $tableName Name of the custom table * @param string $tableName Name of the custom table
*/ */
function setSource($tableName) { function setSource($tableName) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
if ($db->isInterfaceSupported('listSources')) { if ($db->isInterfaceSupported('listSources')) {
$prefix = ''; $prefix = '';
@ -709,7 +709,7 @@ class Model extends Overloadable {
* @return array Array of table metadata * @return array Array of table metadata
*/ */
function loadInfo() { function loadInfo() {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
if (!is_object($this->_tableInfo) && $db->isInterfaceSupported('describe')) { if (!is_object($this->_tableInfo) && $db->isInterfaceSupported('describe')) {
$this->_tableInfo = new NeatArray($db->describe($this)); $this->_tableInfo = new NeatArray($db->describe($this));
@ -724,7 +724,7 @@ class Model extends Overloadable {
function getColumnTypes() { function getColumnTypes() {
$columns = $this->loadInfo(); $columns = $this->loadInfo();
$columns = $columns->value; $columns = $columns->value;
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
$cols = array(); $cols = array();
foreach($columns as $col) { foreach($columns as $col) {
@ -741,7 +741,7 @@ class Model extends Overloadable {
function getColumnType($column) { function getColumnType($column) {
$columns = $this->loadInfo(); $columns = $this->loadInfo();
$columns = $columns->value; $columns = $columns->value;
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
$cols = array(); $cols = array();
foreach($columns as $col) { foreach($columns as $col) {
@ -815,7 +815,6 @@ class Model extends Overloadable {
} }
if ($this->id !== null && $this->id !== false) { if ($this->id !== null && $this->id !== false) {
$db =& $this->getDataSource();
return $this->find(array($this->name . '.' . $this->primaryKey => $id), $fields); return $this->find(array($this->name . '.' . $this->primaryKey => $id), $fields);
} else { } else {
return false; return false;
@ -879,7 +878,7 @@ class Model extends Overloadable {
* @return boolean success * @return boolean success
*/ */
function save($data = null, $validate = true, $fieldList = array()) { function save($data = null, $validate = true, $fieldList = array()) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
if ($data) { if ($data) {
if (countdim($data) == 1) { if (countdim($data) == 1) {
@ -1001,7 +1000,7 @@ class Model extends Overloadable {
* @access private * @access private
*/ */
function __saveMulti($joined, $id) { function __saveMulti($joined, $id) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
foreach($joined as $x => $y) { foreach($joined as $x => $y) {
foreach($y as $assoc => $value) { foreach($y as $assoc => $value) {
@ -1033,7 +1032,7 @@ class Model extends Overloadable {
$total = count($joinTable); $total = count($joinTable);
for($count = 0; $count < $total; $count++) { for($count = 0; $count < $total; $count++) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
$table = $db->name($db->fullTableName($joinTable[$count])); $table = $db->name($db->fullTableName($joinTable[$count]));
$db->execute("DELETE FROM {$table} WHERE {$mainKey[$count]} = '{$id}'"); $db->execute("DELETE FROM {$table} WHERE {$mainKey[$count]} = '{$id}'");
@ -1070,7 +1069,7 @@ class Model extends Overloadable {
$id = $this->id; $id = $this->id;
if ($this->beforeDelete()) { if ($this->beforeDelete()) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
if ($this->id && $db->delete($this)) { if ($this->id && $db->delete($this)) {
$this->_deleteMulti($id); $this->_deleteMulti($id);
@ -1144,7 +1143,7 @@ class Model extends Overloadable {
* @access protected * @access protected
*/ */
function _deleteMulti($id) { function _deleteMulti($id) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
foreach($this->hasAndBelongsToMany as $assoc => $data) { foreach($this->hasAndBelongsToMany as $assoc => $data) {
$db->execute("DELETE FROM " . $db->name($db->fullTableName($data['joinTable'])) . " WHERE " . $db->name($data['foreignKey']) . " = '{$id}'"); $db->execute("DELETE FROM " . $db->name($db->fullTableName($data['joinTable'])) . " WHERE " . $db->name($data['foreignKey']) . " = '{$id}'");
} }
@ -1167,7 +1166,7 @@ class Model extends Overloadable {
} }
} }
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
return $db->hasAny($this, array($this->primaryKey => $id)); return $db->hasAny($this, array($this->primaryKey => $id));
} }
return false; return false;
@ -1215,7 +1214,7 @@ class Model extends Overloadable {
*/ */
function findAll($conditions = null, $fields = null, $order = null, $limit = null, $page = 1, $recursive = null) { function findAll($conditions = null, $fields = null, $order = null, $limit = null, $page = 1, $recursive = null) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
$this->id = $this->getID(); $this->id = $this->getID();
$offset = null; $offset = null;
@ -1297,7 +1296,7 @@ class Model extends Overloadable {
* @return array * @return array
*/ */
function execute($data) { function execute($data) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
$data = $db->fetchAll($data, $this->cacheQueries); $data = $db->fetchAll($data, $this->cacheQueries);
foreach($data as $key => $value) { foreach($data as $key => $value) {
@ -1382,7 +1381,7 @@ class Model extends Overloadable {
* @return array Array with keys "prev" and "next" that holds the id's * @return array Array with keys "prev" and "next" that holds the id's
*/ */
function findNeighbours($conditions = null, $field, $value) { function findNeighbours($conditions = null, $field, $value) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
if (!is_null($conditions)) { if (!is_null($conditions)) {
$conditions = $conditions . ' AND '; $conditions = $conditions . ' AND ';
@ -1409,7 +1408,7 @@ class Model extends Overloadable {
*/ */
function query() { function query() {
$params = func_get_args(); $params = func_get_args();
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
return call_user_func_array(array(&$db, 'query'), $params); return call_user_func_array(array(&$db, 'query'), $params);
} }
/** /**
@ -1507,7 +1506,7 @@ class Model extends Overloadable {
* @return array An associative array of records, where the id is the key, and the display field is the value * @return array An associative array of records, where the id is the key, and the display field is the value
*/ */
function generateList($conditions = null, $order = null, $limit = null, $keyPath = null, $valuePath = null, $groupPath = null) { function generateList($conditions = null, $order = null, $limit = null, $keyPath = null, $valuePath = null, $groupPath = null) {
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
if ($keyPath == null && $valuePath == null && $groupPath == null && $this->hasField($this->displayField)) { if ($keyPath == null && $valuePath == null && $groupPath == null && $this->hasField($this->displayField)) {
$fields = array($this->primaryKey, $this->displayField); $fields = array($this->primaryKey, $this->displayField);
@ -1560,7 +1559,7 @@ class Model extends Overloadable {
if ($alias == null) { if ($alias == null) {
$alias = $this->name; $alias = $this->name;
} }
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
return $db->name($alias) . '.' . $db->name($field); return $db->name($alias) . '.' . $db->name($field);
} }
/** /**
@ -1611,7 +1610,7 @@ class Model extends Overloadable {
*/ */
function getNumRows() { function getNumRows() {
//return $this->__numRows; //return $this->__numRows;
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
return $db->lastNumRows(); return $db->lastNumRows();
} }
/** /**
@ -1621,7 +1620,7 @@ class Model extends Overloadable {
*/ */
function getAffectedRows() { function getAffectedRows() {
//return $this->__affectedRows; //return $this->__affectedRows;
$db =& $this->getDataSource(); $db =& ConnectionManager::getDataSource($this->useDbConfig);
return $db->lastAffected(); return $db->lastAffected();
} }
/** /**
@ -1646,12 +1645,14 @@ class Model extends Overloadable {
} }
} }
/** /**
* Gets the DataSource to which this model is bound * Gets the DataSource to which this model is bound.
* Not safe for use with some versions of PHP4, because this class is overloaded.
* *
* @return DataSource A DataSource object * @return DataSource A DataSource object
*/ */
function &getDataSource() { function &getDataSource() {
return ConnectionManager::getDataSource($this->useDbConfig); $db =& ConnectionManager::getDataSource($this->useDbConfig);
return $db;
} }
/** /**
* Gets all the models with which this model is associated * Gets all the models with which this model is associated