Skip to content

RemoveClassifiedEventActivity: check if calendar still exists #13503

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

Merged
nickvergessen merged 1 commit into from
Jan 11, 2019
Merged

RemoveClassifiedEventActivity: check if calendar still exists #13503

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
Check for no longer existing calendars 
Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer committed Jan 11, 2019
commit 12e24ed6e706e78190ebea1d95a7927f097003e0
8 changes: 8 additions & 0 deletions apps/dav/lib/Migration/RemoveClassifiedEventActivity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ protected function removePrivateEventActivity(): int {
$result = $query->execute();

while ($row = $result->fetch()) {
if ($row['principaluri'] === null) {
continue;
Copy link
Member

@nickvergessen nickvergessen Jan 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually we should delete those right away. But I will add a new repair step to check this.

Copy link
Member

@MorrisJobke MorrisJobke Jan 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why wasn't this added to the SQL statement? 😉

}

$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
->setParameter('type', 'calendar')
->setParameter('calendar_id', $row['calendarid'])
Expand Down Expand Up @@ -105,6 +109,10 @@ protected function removeConfidentialUncensoredEventActivity(): int {
$result = $query->execute();

while ($row = $result->fetch()) {
if ($row['principaluri'] === null) {
continue;
}

$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
->setParameter('type', 'calendar')
->setParameter('calendar_id', $row['calendarid'])
Expand Down