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

Merge pull request #2691 from Icinga/fix-pgsql-timestamps-2651 

Fix local timestamp for PostgreSQL queries
This commit is contained in:
Eric Lippmann 2017-01-18 09:23:28 +01:00
parent 21b75e624e b474482188
commit 0dc528fc24
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -656,7 +656,7 @@ abstract class IdoQuery extends DbQuery
$column $column
); );
if (version_compare($this->getIdoVersion(), '1.14.2', '>=')) { if (version_compare($this->getIdoVersion(), '1.14.2', '>=')) {
$column = str_replace('NOW()', 'localtimestamp', $column); $column = str_replace('NOW()', 'NOW() AT TIME ZONE \'UTC\'', $column);
} else { } else {
$column = preg_replace( $column = preg_replace(
'/UNIX_TIMESTAMP(\((?>[^()]|(?-1))*\))/i', '/UNIX_TIMESTAMP(\((?>[^()]|(?-1))*\))/i',