Permalink
Browse files

Removing use of subclass method 'fullTableName()' in Datasource super…

…class. Fixes #100.
  • Loading branch information...
1 parent 88a09cf commit 4d1f6b82e809a8c5657d7d92e8b2e8a3b2a8a334 @jperras jperras committed Jan 14, 2010
Showing with 7 additions and 6 deletions.
  1. +7 −6 cake/libs/model/datasources/datasource.php
View
13 cake/libs/model/datasources/datasource.php
@@ -123,9 +123,9 @@ class DataSource extends Object {
var $_queriesLog = array();
/**
- * Maximum number of items in query log, to prevent query log taking over
- * too much memory on large amounts of queries -- I we've had problems at
- * >6000 queries on one system.
+ * Maximum number of items in query log
+ *
+ * This is to prevent query log taking over too much memory.
*
* @var int Maximum number of queries in the queries log.
* @access protected
@@ -270,7 +270,8 @@ function describe(&$model) {
if ($this->cacheSources === false) {
return null;
}
- $table = $this->fullTableName($model, false);
+ $table = $model->tablePrefix . $model->table;
+
if (isset($this->__descriptions[$table])) {
return $this->__descriptions[$table];
}
@@ -374,7 +375,7 @@ function update(&$model, $fields = null, $values = null) {
* To-be-overridden in subclasses.
*
* @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
*/
function delete(&$model, $id = null) {
@@ -489,7 +490,7 @@ function __cacheDescription($object, $data = null) {
* @param array $data Array of data with values that will be inserted in placeholders.
* @param string $association Name of association model being replaced
* @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 array $stack
* @return string String of query data with placeholders replaced.

0 comments on commit 4d1f6b8

Please sign in to comment.