adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-02 17:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating DboSource::conditions() to use cacheMethod(). Refs #458

Browse source
This commit is contained in:
Mark Story 2010-03-13 23:00:08 -05:00
parent c059cf5175
commit 32432e8de6
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2050,8 +2050,8 @@ class DboSource extends DataSource {
$cacheKey = array($conditions, $quoteValues, $where);
}
$cacheKey = crc32(serialize($cacheKey));
if (isset($this->methodCache[__FUNCTION__][$cacheKey])) {
return $this->methodCache[__FUNCTION__][$cacheKey];
if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
return $return;
}
$clause = $out = '';
@ -2064,16 +2064,16 @@ class DboSource extends DataSource {
$out = $this->conditionKeysToString($conditions, $quoteValues, $model);
if (empty($out)) {
return $this->methodCache[__FUNCTION__][$cacheKey] = $clause . ' 1 = 1';
return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . ' 1 = 1');
}
return $this->methodCache[__FUNCTION__][$cacheKey] = $clause . implode(' AND ', $out);
return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . implode(' AND ', $out));
}
if ($conditions === false || $conditions === true) {
return $this->methodCache[__FUNCTION__][$cacheKey] = $clause . (int)$conditions . ' = 1';
return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . (int)$conditions . ' = 1');
}
if (empty($conditions) || trim($conditions) == '') {
return $this->methodCache[__FUNCTION__][$cacheKey] = $clause . '1 = 1';
return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . '1 = 1');
}
$clauses = '/^WHERE\\x20|^GROUP\\x20BY\\x20|^HAVING\\x20|^ORDER\\x20BY\\x20/i';
@ -2085,7 +2085,7 @@ class DboSource extends DataSource {
} else {
$conditions = $this->__quoteFields($conditions);
}
return $this->methodCache[__FUNCTION__][$cacheKey] = $clause . $conditions;
return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . $conditions);
}
/**