2 files changed, 10 insertions(+), 2 deletions(-)

M module-db/Tables/AlarmEventsTable.cpp
M module-db/tests/AlarmEventRecord_tests.cpp

@@ 204,8 204,8 @@ std::vector<AlarmEventsTableRow> AlarmEventsTable::getRecurringBetweenDates(Time
 {
     auto retQuery = db->query("SELECT * FROM events e "
                               "JOIN alarm_events ae ON ae.event_id = e._id "
-                              "WHERE start_date BETWEEN '%q' and '%q' "
-                              "OR (start_date <= '%q' AND end_date >= '%q') "
+                              "WHERE (start_date BETWEEN '%q' and '%q' "
+                              "OR (start_date <= '%q' AND end_date >= '%q')) "
                               "AND rrule <> '' "
                               "ORDER BY start_date LIMIT %lu OFFSET %lu;",
                               TimePointToString(startDate).c_str(),

@@ 480,6 480,14 @@ TEST_CASE("AlarmEventRecord tests")
                  testMusicTone,
                  testEnabled,
                  testSnoozeDuration);
+        addQuery("TestAlarmName4",
+                 testEventStart,
+                 testDuration,
+                 testIsAllDay,
+                 testEmptyRRuleText,
+                 testMusicTone,
+                 testEnabled,
+                 testSnoozeDuration);
         auto alarms = getRecurringBetweenDatesQuery(
             TimePointFromString("2020-01-01 12:00:00"), TimePointFromString("2020-01-11 11:00:00"), 0, 100);
         REQUIRE(alarms.size() == 0);