From 68a970663fd1213e1a9cb1aca3e19e07b620d36d Mon Sep 17 00:00:00 2001 From: Clint Armstrong Date: Tue, 8 Sep 2015 10:30:08 -0400 Subject: [PATCH] MySQL doesn't support specifying microsecond precision, and MariaDB defaults to zero, so it can be removed to be compatible with both. --- poller-service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poller-service.py b/poller-service.py index e393f9ac7..3f72ca4b9 100755 --- a/poller-service.py +++ b/poller-service.py @@ -259,7 +259,7 @@ dev_query = ('SELECT device_id, status, ' INTERVAL last_polled_timetaken SECOND ' ' ), ' ' INTERVAL {0} SECOND) ' - ' AS DATETIME(0) ' + ' AS DATETIME ' ') AS next_poll, ' 'CAST( ' ' DATE_ADD( ' @@ -268,7 +268,7 @@ dev_query = ('SELECT device_id, status, ' INTERVAL last_discovered_timetaken SECOND ' ' ), ' ' INTERVAL {1} SECOND) ' - ' AS DATETIME(0) ' + ' AS DATETIME ' ') as next_discovery ' 'FROM devices WHERE ' 'disabled = 0 '