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

PosgreSQL: use ENCODE, not HEX

This commit is contained in:
Thomas Gelf 2015-06-23 13:28:14 +02:00
parent 6c8213f4db
commit 3087776f6b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/tables/GeneratedConfigTable.php
View File

@ -8,13 +8,19 @@ class GeneratedConfigTable extends QuickTable
{ {
public function getColumns() public function getColumns()
{ {
return array( $columns = array(
'checksum' => 'LOWER(HEX(c.checksum))', 'checksum' => 'LOWER(HEX(c.checksum))',
'duration' => "c.duration || 'ms'", 'duration' => "c.duration || 'ms'",
'files' => 'COUNT(cf.file_checksum)', 'files' => 'COUNT(cf.file_checksum)',
'last_related_change' => 'l.change_time', 'last_related_change' => 'l.change_time',
'activity_log_id' => 'l.id' 'activity_log_id' => 'l.id'
); );
if ($this->db->getDbType() === 'psql') {
$columns['checksum'] = "LOWER(ENCODE(c.checksum, 'hex'))";
}
return $columns;
} }
protected function getActionUrl($row) protected function getActionUrl($row)

4
library/Director/Db.php
View File

@ -33,7 +33,11 @@ class Db extends DbConnection
public function getLastActivityChecksum() public function getLastActivityChecksum()
{ {
if ($this->getDbType() === 'psql') {
$select = "SELECT checksum FROM (SELECT * FROM (SELECT 1 AS pos, LOWER(HEX(checksum)) AS checksum FROM director_activity_log ORDER BY change_time DESC LIMIT 1) a UNION SELECT 2 AS pos, '' AS checksum) u ORDER BY pos LIMIT 1"; $select = "SELECT checksum FROM (SELECT * FROM (SELECT 1 AS pos, LOWER(HEX(checksum)) AS checksum FROM director_activity_log ORDER BY change_time DESC LIMIT 1) a UNION SELECT 2 AS pos, '' AS checksum) u ORDER BY pos LIMIT 1";
} else {
$select = "SELECT checksum FROM (SELECT * FROM (SELECT 1 AS pos, LOWER(ENCODE(checksum, 'hex')) AS checksum FROM director_activity_log ORDER BY change_time DESC LIMIT 1) a UNION SELECT 2 AS pos, '' AS checksum) u ORDER BY pos LIMIT 1";
}
return $this->db()->fetchOne($select); return $this->db()->fetchOne($select);
} }