tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DbObject: exists() should respect prefetch... 

...also for negative lookups

refs #12876
This commit is contained in:
Thomas Gelf 2016-10-08 19:34:59 +00:00
parent bd3ae6d181
commit 42aef0105d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/Director/Data/Db/DbObject.php
View File

@ -933,6 +933,12 @@ abstract class DbObject
return $obj; return $obj;
} }
protected static function classWasPrefetched()
{
$class = get_called_class();
return array_key_exists($class, self::$prefetched);
}
protected static function getPrefetched($key) protected static function getPrefetched($key)
{ {
$class = get_called_class(); $class = get_called_class();
@ -951,8 +957,6 @@ abstract class DbObject
protected static function hasPrefetched($key) protected static function hasPrefetched($key)
{ {
// TODO: temporarily disabled as of collisions with services
//return false;
$class = get_called_class(); $class = get_called_class();
if (! array_key_exists($class, self::$prefetchStats)) { if (! array_key_exists($class, self::$prefetchStats)) {
self::$prefetchStats[$class] = (object) array( self::$prefetchStats[$class] = (object) array(
@ -1088,6 +1092,8 @@ abstract class DbObject
{ {
if (static::getPrefetched($id)) { if (static::getPrefetched($id)) {
return true; return true;
} elseif (static::classWasPrefetched()) {
return false;
} }
$class = get_called_class(); $class = get_called_class();