Skip to content

test: Stop using the internal real database #61566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
provokateurin wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

test: Stop using the internal real database #61566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a79c58
test: Stop using the internal real database
provokateurin Jun 11, 2026
b6b1ca7
fix(TestCase): Make $realDatabase private
provokateurin Jun 24, 2026
9614fbb
test(dav): make CalDAV tests pass
hamza221 Jun 29, 2026
e575627
test(dav): use a fresh query builder per insert in resource booking t…
hamza221 Jun 30, 2026
5f845e8
test(dav): set uri on calendarobjects fixtures in reminder backend test
hamza221 Jun 30, 2026
e59b295
test(dav): set uid on calendarobjects fixtures in reminder backend test
hamza221 Jun 30, 2026
c34f6cf
test(dav): fix ORA-00932: inconsistent datatypes: expected - got BLOB
hamza221 Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions apps/dav/lib/CalDAV/Reminder/Backend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,12 @@ public function getRemindersToProcess():array {
->from('calendar_reminders', 'cr')
->where($query->expr()->lte('cr.notification_date', $query->createNamedParameter($this->timeFactory->getTime())))
->join('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id'))
->join('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'))
->groupBy('cr.event_hash', 'cr.notification_date', 'cr.type', 'cr.id', 'cr.calendar_id', 'cr.object_id', 'cr.is_recurring', 'cr.uid', 'cr.recurrence_id', 'cr.is_recurrence_exception', 'cr.alarm_hash', 'cr.is_relative', 'cr.is_repeat_based', 'co.calendardata', 'c.displayname', 'c.principaluri');
->join('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'));
$stmt = $query->executeQuery();

return array_map(
[$this, 'fixRowTyping'],
$stmt->fetchAllAssociative()
$this->deduplicateReminderRows($stmt->fetchAllAssociative())
);
}

Expand Down Expand Up @@ -178,6 +177,26 @@ public function cleanRemindersForCalendar(int $calendarId):void {
->executeStatement();
}

/**
* @param array<array<string, mixed>> $rows
* @return array<array<string, mixed>>
*/
private function deduplicateReminderRows(array $rows): array {
$uniqueRows = [];
foreach ($rows as $row) {
$key = implode("\0", [
(string)$row['notification_date'],
(string)$row['event_hash'],
(string)$row['type'],
]);
if (!isset($uniqueRows[$key])) {
$uniqueRows[$key] = $row;
}
}

return array_values($uniqueRows);
}

/**
* @param array $row
* @return array
Expand Down
Loading
Loading