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.

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

RemoveClassifiedEventActivity: check if calendar still exists #13503

Merged
merged 1 commit into from Jan 11, 2019

Conversation

Projects
None yet
5 participants
@rullzer
Copy link
Member

rullzer commented Jan 11, 2019

Thnx for spotting @go2sh

@rullzer rullzer added this to the Nextcloud 16 milestone Jan 11, 2019

@ChristophWurst

This comment has been minimized.

Copy link
Member

ChristophWurst commented Jan 11, 2019

What about #13499 (comment)?

@rullzer

This comment has been minimized.

Copy link
Member

rullzer commented Jan 11, 2019

Yeah that should be fixed since we now fetch the right principal

@ChristophWurst
Copy link
Member

ChristophWurst left a comment

Diff makes sense 👍

Not tested yet, but trying to reproduce now

@go2sh

This comment has been minimized.

Copy link
Contributor

go2sh commented Jan 11, 2019

I did update our instance to 15.0.1, but I was not able to reproduce it.

@go2sh

go2sh approved these changes Jan 11, 2019

@rullzer

This comment has been minimized.

Copy link
Member

rullzer commented Jan 11, 2019

Mmmm this is weird. On my own setup the column names are correct.

@rullzer

This comment has been minimized.

Copy link
Member

rullzer commented Jan 11, 2019

(i.e. this patch breaks them)

@rullzer

This comment has been minimized.

Copy link
Member

rullzer commented Jan 11, 2019

maybe the problem comes from some events that do not have a proper principal uri set?

@nickvergessen
Copy link
Member

nickvergessen left a comment

This does not work. The array does not have the table aliases on the entries

@ChristophWurst

This comment has been minimized.

Copy link
Member

ChristophWurst commented Jan 11, 2019

This does not work. The array does not have the table aliases on the entries

Right
bildschirmfoto von 2019-01-11 09-27-23

(upgrade to master)

does not seem to be the correct fix

Check for no longer existing calendars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

@rullzer rullzer force-pushed the fix/13499 branch from 0ec2a27 to 12e24ed Jan 11, 2019

@rullzer rullzer changed the title Use the correct column names in RemoveClassifiedEventActivity RemoveClassifiedEventActivity: check if calendar still exists Jan 11, 2019

@@ -75,6 +75,10 @@ protected function removePrivateEventActivity(): int {
$result = $query->execute();
while ($row = $result->fetch()) {
if ($row['principaluri'] === null) {
continue;

This comment has been minimized.

@nickvergessen

nickvergessen Jan 11, 2019

Member

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

This comment has been minimized.

@MorrisJobke

MorrisJobke Jan 11, 2019

Member

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

@ChristophWurst
Copy link
Member

ChristophWurst left a comment

Makes sense!

@nickvergessen nickvergessen merged commit e7b9746 into master Jan 11, 2019

1 check failed

continuous-integration/drone/pr the build failed
Details

@nickvergessen nickvergessen deleted the fix/13499 branch Jan 11, 2019

@nickvergessen

This comment has been minimized.

Copy link
Member

nickvergessen commented Jan 11, 2019

/backport to stable15

@nickvergessen

This comment has been minimized.

Copy link
Member

nickvergessen commented Jan 11, 2019

/backport to stable14

@nickvergessen

This comment has been minimized.

Copy link
Member

nickvergessen commented Jan 11, 2019

/backport to stable13

@backportbot-nextcloud

This comment has been minimized.

Copy link

backportbot-nextcloud bot commented Jan 11, 2019

backport to stable15 in #13506

@backportbot-nextcloud

This comment has been minimized.

Copy link

backportbot-nextcloud bot commented Jan 11, 2019

backport to stable14 in #13507

@backportbot-nextcloud

This comment has been minimized.

Copy link

backportbot-nextcloud bot commented Jan 11, 2019

backport to stable13 in #13508

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment