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

NotificationQuery: Rename baseQuery to select

This commit is contained in:
Eric Lippmann 2014-04-15 18:09:08 +02:00
parent 687fa09f7c
commit 0adbb6a44e
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
View File

@ -62,10 +62,8 @@ class NotificationQuery extends IdoQuery
*/
protected function joinBaseTables()
{
$this->baseQuery = $this->db->select()->from(
array(
'n' => $this->prefix . 'notifications'
),
$this->select->from(
array('n' => $this->prefix . 'notifications'),
array()
);
$this->joinedVirtualTables = array('notification' => true);
@ -76,10 +74,8 @@ class NotificationQuery extends IdoQuery
*/
protected function joinObjects()
{
$this->baseQuery->join(
array(
'o' => $this->prefix . 'objects'
),
$this->select->join(
array('o' => $this->prefix . 'objects'),
'n.object_id = o.object_id AND o.is_active = 1 AND o.objecttype_id IN (1, 2)',
array()
);
@ -90,17 +86,13 @@ class NotificationQuery extends IdoQuery
*/
protected function joinContact()
{
$this->baseQuery->join(
array(
'c' => $this->prefix . 'contactnotifications'
),
$this->select->join(
array('c' => $this->prefix . 'contactnotifications'),
'n.notification_id = c.notification_id',
array()
);
$this->baseQuery->join(
array(
'c_o' => $this->prefix . 'objects'
),
$this->select->join(
array('c_o' => $this->prefix . 'objects'),
'c.contact_object_id = c_o.object_id',
array()
);
@ -111,24 +103,18 @@ class NotificationQuery extends IdoQuery
*/
protected function joinCommand()
{
$this->baseQuery->join(
array(
'cmd_c' => $this->prefix . 'contactnotifications'
),
$this->select->join(
array('cmd_c' => $this->prefix . 'contactnotifications'),
'n.notification_id = cmd_c.notification_id',
array()
);
$this->baseQuery->joinLeft(
array(
'cmd_m' => $this->prefix . 'contactnotificationmethods'
),
$this->select->joinLeft(
array('cmd_m' => $this->prefix . 'contactnotificationmethods'),
'cmd_c.contactnotification_id = cmd_m.contactnotification_id',
array()
);
$this->baseQuery->joinLeft(
array(
'cmd_o' => $this->prefix . 'objects'
),
$this->select->joinLeft(
array('cmd_o' => $this->prefix . 'objects'),
'cmd_m.command_object_id = cmd_o.object_id',
array()
);