tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Take orderby clause into account when caching in DataObject::get_one()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47749 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2008-01-09 02:31:03 +00:00
parent 4dd628c9d0
commit 0b445d7b7f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/model/DataObject.php
View File

@ -1495,8 +1495,6 @@ class DataObject extends Controller implements DataObjectInterface {
* Return the first item matching the given query. * Return the first item matching the given query.
* All calls to get_one() are cached. * All calls to get_one() are cached.
* *
* TODO Caching doesn't respect sorting.
*
* @param string $callerClass The class of objects to be returned * @param string $callerClass The class of objects to be returned
* @param string $filter A filter to be inserted into the WHERE clause * @param string $filter A filter to be inserted into the WHERE clause
* @param boolean $cache Use caching * @param boolean $cache Use caching
@ -1505,16 +1503,17 @@ class DataObject extends Controller implements DataObjectInterface {
* @return DataObject The first item matching the query * @return DataObject The first item matching the query
*/ */
public static function get_one($callerClass, $filter = "", $cache = true, $orderby = "") { public static function get_one($callerClass, $filter = "", $cache = true, $orderby = "") {
if(!$cache || !isset(DataObject::$cache_get_one[$callerClass][$filter]) || DataObject::$cache_get_one[$callerClass][$filter]->destroyed) { $sum = md5("{$filter}_{$orderby}");
if(!$cache || !isset(DataObject::$cache_get_one[$callerClass][$sum]) || DataObject::$cache_get_one[$callerClass][$sum]->destroyed) {
$item = singleton($callerClass)->instance_get_one($filter, $orderby); $item = singleton($callerClass)->instance_get_one($filter, $orderby);
if($cache) { if($cache) {
DataObject::$cache_get_one[$callerClass][$filter] = $item; DataObject::$cache_get_one[$callerClass][$sum] = $item;
if(!DataObject::$cache_get_one[$callerClass][$filter]) { if(!DataObject::$cache_get_one[$callerClass][$sum]) {
DataObject::$cache_get_one[$callerClass][$filter] = false; DataObject::$cache_get_one[$callerClass][$sum] = false;
} }
} }
} }
return $cache ? DataObject::$cache_get_one[$callerClass][$filter] : $item; return $cache ? DataObject::$cache_get_one[$callerClass][$sum] : $item;
} }
/** /**