Skip to content

test(dav): fix ORA-00932: inconsistent datatypes: expected - got BLOB #61913

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
hamza221 wants to merge 1 commit into
base: test/stop-using-internal-database
Choose a base branch
from
+100 −42
Draft

test(dav): fix ORA-00932: inconsistent datatypes: expected - got BLOB #61913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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'],
]);
Comment on lines +187 to +191
if (!isset($uniqueRows[$key])) {
$uniqueRows[$key] = $row;
}
}

return array_values($uniqueRows);
}

/**
* @param array $row
* @return array
Expand Down
114 changes: 76 additions & 38 deletions apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function testCleanRemindersForEvent(): void {
->executeQuery()
->fetchAllAssociative();

$this->assertCount(4, $rows);
$this->assertCount(5, $rows);

$this->reminderBackend->cleanRemindersForEvent(1);

Expand All @@ -73,7 +73,7 @@ public function testCleanRemindersForCalendar(): void {
->executeQuery()
->fetchAllAssociative();

$this->assertCount(4, $rows);
$this->assertCount(5, $rows);

$this->reminderBackend->cleanRemindersForCalendar(1);

Expand All @@ -93,7 +93,7 @@ public function testRemoveReminder(): void {
->executeQuery()
->fetchAllAssociative();

$this->assertCount(4, $rows);
$this->assertCount(5, $rows);

$this->reminderBackend->removeReminder((int)$rows[3]['id']);

Expand All @@ -103,7 +103,7 @@ public function testRemoveReminder(): void {
->executeQuery()
->fetchAllAssociative();

$this->assertCount(3, $rows);
$this->assertCount(4, $rows);
}

public function testGetRemindersToProcess(): void {
Expand Down Expand Up @@ -163,37 +163,54 @@ public function testGetRemindersToProcess(): void {
public function testGetAllScheduledRemindersForEvent(): void {
$rows = $this->reminderBackend->getAllScheduledRemindersForEvent(1);

$this->assertCount(2, $rows);
$this->assertCount(3, $rows);
unset($rows[0]['id']);
unset($rows[1]['id']);

$this->assertEquals($rows[0], [
'calendar_id' => 1,
'object_id' => 1,
'uid' => 'asd',
'is_recurring' => false,
'recurrence_id' => 123458,
'is_recurrence_exception' => false,
'event_hash' => 'asd123',
'alarm_hash' => 'asd567',
'type' => 'EMAIL',
'is_relative' => true,
'notification_date' => 123456,
'is_repeat_based' => false,
]);
$this->assertEquals($rows[1], [
'calendar_id' => 1,
'object_id' => 1,
'uid' => 'asd',
'is_recurring' => false,
'recurrence_id' => 123458,
'is_recurrence_exception' => false,
'event_hash' => 'asd123',
'alarm_hash' => 'asd567',
'type' => 'AUDIO',
'is_relative' => true,
'notification_date' => 123456,
'is_repeat_based' => false,
unset($rows[2]['id']);

$this->assertEqualsCanonicalizing($rows, [
[
'calendar_id' => 1,
'object_id' => 1,
'uid' => 'asd',
'is_recurring' => false,
'recurrence_id' => 123458,
'is_recurrence_exception' => false,
'event_hash' => 'asd123',
'alarm_hash' => 'asd567',
'type' => 'EMAIL',
'is_relative' => true,
'notification_date' => 123456,
'is_repeat_based' => false,
],
[
'calendar_id' => 1,
'object_id' => 1,
'uid' => 'asd',
'is_recurring' => false,
'recurrence_id' => 123458,
'is_recurrence_exception' => false,
'event_hash' => 'asd123',
'alarm_hash' => 'asd567',
'type' => 'AUDIO',
'is_relative' => true,
'notification_date' => 123456,
'is_repeat_based' => false,
],
[
'calendar_id' => 1,
'object_id' => 1,
'uid' => 'asd',
'is_recurring' => false,
'recurrence_id' => 123458,
'is_recurrence_exception' => false,
'event_hash' => 'asd123',
'alarm_hash' => 'duplicate',
'type' => 'EMAIL',
'is_relative' => true,
'notification_date' => 123456,
'is_repeat_based' => false,
],
]);
}

Expand All @@ -204,22 +221,23 @@ public function testInsertReminder(): void {
->executeQuery()
->fetchAllAssociative();

$this->assertCount(4, $rows);
$this->assertCount(5, $rows);

$this->reminderBackend->insertReminder(42, 1337, 'uid99', true, 12345678,
true, 'hash99', 'hash42', 'AUDIO', false, 12345670, false);

$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->orderBy('id')
->executeQuery()
->fetchAllAssociative();

$this->assertCount(5, $rows);
$this->assertCount(6, $rows);

unset($rows[4]['id']);
unset($rows[5]['id']);

$this->assertEquals($rows[4], [
$this->assertEquals($rows[5], [
'calendar_id' => '42',
'object_id' => '1337',
'is_recurring' => '1',
Expand All @@ -239,10 +257,11 @@ public function testUpdateReminder(): void {
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->orderBy('id')
->executeQuery()
->fetchAllAssociative();

$this->assertCount(4, $rows);
$this->assertCount(5, $rows);

$this->assertEquals($rows[3]['notification_date'], 123600);

Expand Down Expand Up @@ -387,5 +406,24 @@ private function createRemindersTestSet(): void {
'is_repeat_based' => $query->createNamedParameter(0),
])
->executeStatement();

// add a duplicate to test getRemindersToProcess dedup
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendar_reminders')
->values([
'calendar_id' => $query->createNamedParameter(1),
'object_id' => $query->createNamedParameter(1),
'uid' => $query->createNamedParameter('asd'),
'is_recurring' => $query->createNamedParameter(0),
'recurrence_id' => $query->createNamedParameter(123458),
'is_recurrence_exception' => $query->createNamedParameter(0),
'event_hash' => $query->createNamedParameter('asd123'),
'alarm_hash' => $query->createNamedParameter('duplicate'),
'type' => $query->createNamedParameter('EMAIL'),
'is_relative' => $query->createNamedParameter(1),
'notification_date' => $query->createNamedParameter(123456),
'is_repeat_based' => $query->createNamedParameter(0),
])
->executeStatement();
}
}
3 changes: 2 additions & 1 deletion apps/user_status/lib/Db/UserStatusMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ public function findAll(?int $limit = null, ?int $offset = null):array {
$qb
->select('*')
->from($this->tableName)
->where($qb->expr()->eq('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)));
->where($qb->expr()->eq('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
->orderBy('user_id', 'ASC');
Comment on lines 39 to +41

if ($limit !== null) {
$qb->setMaxResults($limit);
Expand Down
Loading