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

NotificationQuery: Fix PostgreSQL icompatibility 

refs #4187
This commit is contained in:
Eric Lippmann 2013-08-16 16:18:20 +02:00
parent f4b8b369a8
commit e5f3a063fb
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,9 +25,8 @@
namespace Monitoring\Backend\Ido\Query; namespace Monitoring\Backend\Ido\Query;
/** /**
* NotificationQuery * Notification query
*/ */
class NotificationQuery extends AbstractQuery class NotificationQuery extends AbstractQuery
{ {
@ -38,20 +37,20 @@ class NotificationQuery extends AbstractQuery
*/ */
protected $columnMap = array( protected $columnMap = array(
'notification' => array( 'notification' => array(
'notification_type' => 'n.notification_type', 'notification_type' => 'n.notification_type',
'notification_reason' => 'n.notification_reason', 'notification_reason' => 'n.notification_reason',
'notification_start_time' => 'n.start_time', 'notification_start_time' => 'n.start_time',
'notification_information' => 'n.output' 'notification_information' => 'n.output'
), ),
'objects' => array( 'objects' => array(
'host_name' => 'o.name1', 'host_name' => 'o.name1',
'service_description' => 'o.name2' 'service_description' => 'o.name2'
), ),
'contact' => array( 'contact' => array(
'notification_contact' => 'c_o.name1' 'notification_contact' => 'c_o.name1'
), ),
'command' => array( 'command' => array(
'notification_command' => 'cmd_o.name1' 'notification_command' => 'cmd_o.name1'
) )
); );
@ -60,9 +59,12 @@ class NotificationQuery extends AbstractQuery
*/ */
protected function joinBaseTables() protected function joinBaseTables()
{ {
$this->baseQuery = $this->db->select()->from(array( $this->baseQuery = $this->db->select()->from(
'n' => $this->prefix . 'notifications' array(
)); 'n' => $this->prefix . 'notifications'
),
array()
);
$this->joinedVirtualTables = array('notification' => true); $this->joinedVirtualTables = array('notification' => true);
} }
@ -71,11 +73,12 @@ class NotificationQuery extends AbstractQuery
*/ */
protected function joinObjects() protected function joinObjects()
{ {
$this->baseQuery->joinInner( $this->baseQuery->join(
array( array(
'o' => $this->prefix . 'objects' 'o' => $this->prefix . 'objects'
), ),
'n.object_id = o.object_id AND o.is_active = 1 AND o.objecttype_id IN (1, 2)' 'n.object_id = o.object_id AND o.is_active = 1 AND o.objecttype_id IN (1, 2)',
array()
); );
} }
@ -84,17 +87,19 @@ class NotificationQuery extends AbstractQuery
*/ */
protected function joinContact() protected function joinContact()
{ {
$this->baseQuery->joinInner( $this->baseQuery->join(
array( array(
'c' => $this->prefix . 'contactnotifications' 'c' => $this->prefix . 'contactnotifications'
), ),
'n.notification_id = c.notification_id' 'n.notification_id = c.notification_id',
array()
); );
$this->baseQuery->joinInner( $this->baseQuery->join(
array( array(
'c_o' => $this->prefix . 'objects' 'c_o' => $this->prefix . 'objects'
), ),
'c.contact_object_id = c_o.object_id' 'c.contact_object_id = c_o.object_id',
array()
); );
} }
@ -103,23 +108,26 @@ class NotificationQuery extends AbstractQuery
*/ */
protected function joinCommand() protected function joinCommand()
{ {
$this->baseQuery->joinInner( $this->baseQuery->join(
array( array(
'cmd_c' => $this->prefix . 'contactnotifications' 'cmd_c' => $this->prefix . 'contactnotifications'
), ),
'n.notification_id = cmd_c.notification_id' 'n.notification_id = cmd_c.notification_id',
array()
); );
$this->baseQuery->joinInner( $this->baseQuery->join(
array( array(
'cmd_m' => $this->prefix . 'contactnotificationmethods' 'cmd_m' => $this->prefix . 'contactnotificationmethods'
), ),
'cmd_c.notification_id = cmd_m.contactnotification_id' 'cmd_c.notification_id = cmd_m.contactnotification_id',
array()
); );
$this->baseQuery->joinInner( $this->baseQuery->join(
array( array(
'cmd_o' => $this->prefix . 'objects' 'cmd_o' => $this->prefix . 'objects'
), ),
'cmd_m.command_object_id = cmd_o.object_id' 'cmd_m.command_object_id = cmd_o.object_id',
array()
); );
} }
} }