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

Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100.

Browse source
This commit is contained in:
Joël Perras 2010-01-13 23:14:06 -05:00
parent 88a09cfbb4
commit 4d1f6b82e8
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cake/libs/model/datasources/datasource.php
View file

@ -123,9 +123,9 @@ class DataSource extends Object {
var $_queriesLog = array(); var $_queriesLog = array();
/** /**
* Maximum number of items in query log, to prevent query log taking over * Maximum number of items in query log
* too much memory on large amounts of queries -- I we've had problems at *
* >6000 queries on one system. * This is to prevent query log taking over too much memory.
* *
* @var int Maximum number of queries in the queries log. * @var int Maximum number of queries in the queries log.
* @access protected * @access protected
@ -270,7 +270,8 @@ class DataSource extends Object {
if ($this->cacheSources === false) { if ($this->cacheSources === false) {
return null; return null;
} }
$table = $this->fullTableName($model, false); $table = $model->tablePrefix . $model->table;
if (isset($this->__descriptions[$table])) { if (isset($this->__descriptions[$table])) {
return $this->__descriptions[$table]; return $this->__descriptions[$table];
} }
@ -374,7 +375,7 @@ class DataSource extends Object {
* To-be-overridden in subclasses. * To-be-overridden in subclasses.
* *
* @param Model $model The model class having record(s) deleted * @param Model $model The model class having record(s) deleted
* @param mixed $id Primary key of the model * @param mixed $id Primary key of the model
* @access public * @access public
*/ */
function delete(&$model, $id = null) { function delete(&$model, $id = null) {
@ -489,7 +490,7 @@ class DataSource extends Object {
* @param array $data Array of data with values that will be inserted in placeholders. * @param array $data Array of data with values that will be inserted in placeholders.
* @param string $association Name of association model being replaced * @param string $association Name of association model being replaced
* @param unknown_type $assocData * @param unknown_type $assocData
* @param Model $model Instance of the model to replace $__cakeID__$ * @param Model $model Instance of the model to replace $__cakeID__$
* @param Model $linkModel Instance of model to replace $__cakeForeignKey__$ * @param Model $linkModel Instance of model to replace $__cakeForeignKey__$
* @param array $stack * @param array $stack
* @return string String of query data with placeholders replaced. * @return string String of query data with placeholders replaced.