Skip to content

Conversation

@kesselb
Copy link
Contributor

@kesselb kesselb commented Oct 29, 2019

Fix #17479

@kesselb kesselb added this to the Nextcloud 18 milestone Oct 29, 2019
@kesselb
Copy link
Contributor Author

kesselb commented Oct 29, 2019

/backport to stable17

@nickvergessen
Copy link
Member

Why? The schema should only be returned when it actually changed something. Which is only the case inside the if?

Otherwise this locks the db starts heavy diffing of the schema just to unlock again?

@kesselb kesselb force-pushed the fix/17479/always-return-schema branch from 5dcae6e to fd83661 Compare October 29, 2019 18:25
@kesselb
Copy link
Contributor Author

kesselb commented Oct 29, 2019

The schema should only be returned when it actually changed something. Which is only the case inside the if?

OK. It returns null outside the if now.

@kesselb kesselb changed the title Always return $schema Return null from migration to match with typehint Oct 29, 2019
$table->addIndex(['object_id'], 'calendar_reminder_objid');
$table->addIndex(['uid', 'recurrence_id'], 'calendar_reminder_uidrec');

return $schema;
Copy link
Member

Choose a reason for hiding this comment

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

Keep this

return $schema;
}

return $schema;
Copy link
Member

Choose a reason for hiding this comment

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

Return null here

@rullzer rullzer merged commit 1a9f551 into master Oct 29, 2019
@rullzer rullzer deleted the fix/17479/always-return-schema branch October 29, 2019 19:38
@backportbot-nextcloud
Copy link

backport to stable17 in #17742

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

Labels

3. to review Waiting for reviews bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upgrade from 16.0.5 to 17.0.0 fails (apps/dav migration crashes)

4 participants