~aleteoryx/muditaos: [EGD-7657] Fix alarm query

e9a159987257cc720443b40e2a0a5404e3ecf30e — Wojtek Rzepecki 4 years ago bd90e57

[EGD-7657] Fix alarm query

Fix of the alarm query to select only
nearest enabled alarm

patch browse .tar.gz

1 files changed, 3 insertions(+), 2 deletions(-)

M module-db/Tables/AlarmEventsTable.cpp

M module-db/Tables/AlarmEventsTable.cpp => module-db/Tables/AlarmEventsTable.cpp +3 -2

@@ 208,8 208,9 @@ std::vector<AlarmEventsTableRow> 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(),