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: allow null components in multicol keys

This commit is contained in:
Thomas Gelf 2015-12-10 11:42:21 +01:00
parent 46ce190813
commit d055c68a5c
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,11 +724,8 @@ abstract class DbObject
}
foreach ($keyname as $k) {
if (! array_key_exists($k, $key)) {
throw new IE(
'Required key component "%s" is missing for "%s", got %s',
$k,
json_encode($key)
);
// We allow for null in multicolumn keys:
$key[$k] = null;
}
$this->set($k, $key[$k]);
}
@ -756,21 +753,31 @@ abstract class DbObject
}
$key = $this->getKeyName();
if (is_array($key) && ! empty($key)) {
$where = array();
foreach ($key as $k) {
if ($this->hasBeenLoadedFromDb()) {
$where[] = $this->db->quoteInto(
sprintf('%s = ?', $k),
$this->loadedProperties[$k]
);
if ($this->loadedProperties[$k] === null) {
$where[] = sprintf('%s IS NULL', $k);
} else {
$where[] = $this->db->quoteInto(
sprintf('%s = ?', $k),
$this->loadedProperties[$k]
);
}
} else {
$where[] = $this->db->quoteInto(
sprintf('%s = ?', $k),
$this->properties[$k]
);
if ($this->properties[$k] === null) {
$where[] = sprintf('%s IS NULL', $k);
} else {
$where[] = $this->db->quoteInto(
sprintf('%s = ?', $k),
$this->properties[$k]
);
}
}
}
return implode(' AND ', $where);
} else {
if ($this->hasBeenLoadedFromDb()) {