fix(appconfig,userconfig): restore pre-migration fallback for ownCloud migration#59677
Draft
miaulalala wants to merge 3 commits intomasterfrom
Draft
fix(appconfig,userconfig): restore pre-migration fallback for ownCloud migration#59677miaulalala wants to merge 3 commits intomasterfrom
miaulalala wants to merge 3 commits intomasterfrom
Conversation
…d migration ownCloud-to-Nextcloud migration broke in NC31+ because AppConfig and UserConfig unconditionally query columns (type, lazy, flags, indexed) that don't exist in ownCloud's database schema. These columns are only created by later migration steps that never get a chance to run. Restore the try/catch fallback in AppConfig::loadConfig() that was removed in a572a5c, and add the same pattern to UserConfig. When the database is missing the expected columns (REASON_INVALID_FIELD_NAME), fall back to querying only the columns that exist in ownCloud's schema. Fixes: #57340 Signed-off-by: Anna Larch <anna@larch.dev> AI-Assisted-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Anna Larch <anna@nextcloud.com>
miaulalala
added
3. to review
Unit tests verifying that AppConfig and UserConfig gracefully handle missing database columns (type, lazy, flags, indexed) during ownCloud migration. Tests cover the loadConfig fallback path, re-throwing of unrelated exceptions, and column omission in insert queries. Signed-off-by: Anna Larch <anna@larch.dev> AI-Assisted-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Anna Larch <anna@nextcloud.com>
Signed-off-by: Anna Larch <anna@larch.dev> AI-Assisted-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Anna Larch <anna@nextcloud.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ownCloud-to-Nextcloud migration broke in NC31+ because AppConfig and UserConfig unconditionally query columns (type, lazy, flags, indexed) that don't exist in ownCloud's database schema. These columns are only created by later migration steps that never get a chance to run.
Restore the try/catch fallback in AppConfig::loadConfig() that was removed in a572a5c, and add the same pattern to UserConfig. When the database is missing the expected columns (REASON_INVALID_FIELD_NAME), fall back to querying only the columns that exist in ownCloud's schema.
Fixes: #57340
AI-Assisted-By: Claude Opus 4.6 noreply@anthropic.com
Summary
TODO
Checklist
3. to review, feature component)stable32)AI (if applicable)