From e9a159987257cc720443b40e2a0a5404e3ecf30e Mon Sep 17 00:00:00 2001 From: Wojtek Rzepecki Date: Thu, 23 Sep 2021 15:31:05 +0200 Subject: [PATCH] [EGD-7657] Fix alarm query Fix of the alarm query to select only nearest enabled alarm --- module-db/Tables/AlarmEventsTable.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module-db/Tables/AlarmEventsTable.cpp b/module-db/Tables/AlarmEventsTable.cpp index 8c8a3547187c2ef5c62d00b1f640e201bc608f3d..34f98158a38bde2bc3307c89f00aa46993d2a312 100644 --- a/module-db/Tables/AlarmEventsTable.cpp +++ b/module-db/Tables/AlarmEventsTable.cpp @@ -208,8 +208,9 @@ std::vector AlarmEventsTable::getNext(TimePoint start, uint "JOIN alarm_events ae ON ae.event_id = e._id " "WHERE start_date = " " (" - " SELECT MIN(e.start_date) FROM events as e " - " WHERE e.start_date > '%q'" + " SELECT MIN(start_date) FROM (events as e " + " JOIN alarm_events ae ON ae.event_id = e._id) " + " WHERE start_date > '%q' AND ae.enabled = 1 " " ) " "LIMIT %lu OFFSET %lu;", TimePointToString(start).c_str(),