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

Prepared more Oracle-specific id-columns

This commit is contained in:
Thomas Gelf 2013-08-20 22:43:04 +02:00 committed by Eric Lippmann
parent d44c15eea0
commit df07735e9a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php
View File

@ -20,9 +20,11 @@ abstract class AbstractQuery extends Query
protected $object_id = 'object_id'; protected $object_id = 'object_id';
protected $host_id = 'host_id'; protected $host_id = 'host_id';
protected $service_id = 'service_id';
protected $hostgroup_id = 'hostgroup_id'; protected $hostgroup_id = 'hostgroup_id';
protected $service_id = 'service_id';
protected $servicegroup_id = 'servicegroup_id'; protected $servicegroup_id = 'servicegroup_id';
protected $contact_id = 'contact_id';
protected $contactgroup_id = 'contactgroup_id';
protected $allowCustomVars = false; protected $allowCustomVars = false;
@ -33,7 +35,9 @@ abstract class AbstractQuery extends Query
$this->prefix = $this->ds->getPrefix(); $this->prefix = $this->ds->getPrefix();
if ($this->ds->getConnection()->getDbType() === 'oracle') { if ($this->ds->getConnection()->getDbType() === 'oracle') {
$this->object_id = $this->host_id = $this->service_id = $this->hostgroup_id = $this->servicegroup_id = 'id'; // REALLY? $this->object_id = $this->host_id = $this->service_id
= $this->hostgroup_id = $this->servicegroup_id
= $this->contact_id = $this->contactgroup_id = 'id'; // REALLY?
foreach ($this->columnMap as $table => & $columns) { foreach ($this->columnMap as $table => & $columns) {
foreach ($columns as $key => & $value) { foreach ($columns as $key => & $value) {
$value = preg_replace('/UNIX_TIMESTAMP/', 'localts2unixts', $value); $value = preg_replace('/UNIX_TIMESTAMP/', 'localts2unixts', $value);