Skip to content
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

ignore metadata if migration to 28 is not done #41442

Merged
merged 2 commits into from
Nov 14, 2023

Conversation

ArtificialOwl
Copy link
Member

since we join the metadata table on Cache::get(), expect error between upgrade and migration.

This fix makes not joining the metadata table until the migration is done

@ArtificialOwl ArtificialOwl force-pushed the fix/noid/no-join-before-migration branch from 911e039 to d463171 Compare November 13, 2023 18:00
@ArtificialOwl ArtificialOwl force-pushed the fix/noid/no-join-before-migration branch from 5302036 to 570b906 Compare November 13, 2023 18:28
@ArtificialOwl ArtificialOwl force-pushed the fix/noid/no-join-before-migration branch 2 times, most recently from db39652 to 175e8cf Compare November 13, 2023 19:52
@ArtificialOwl ArtificialOwl mentioned this pull request Nov 13, 2023
@blizzz blizzz added this to the Nextcloud 28 milestone Nov 14, 2023
@blizzz blizzz added the 3. to review Waiting for reviews label Nov 14, 2023
@@ -214,15 +214,19 @@ public function deleteMetadata(int $fileId): void {
* @param string $fileIdField alias of the field that contains file ids
*
* @inheritDoc
* @return IMetadataQuery
* @return IMetadataQuery|null
Copy link
Collaborator

Choose a reason for hiding this comment

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

The info is already in method signature. We can remove this line.

lib/private/Files/Cache/QuerySearchHelper.php Fixed Show resolved Hide resolved
@come-nc
Copy link
Contributor

come-nc commented Nov 14, 2023

You got hit by vimeo/psalm#10316 I think

Signed-off-by: Maxence Lange <[email protected]>
@ArtificialOwl ArtificialOwl force-pushed the fix/noid/no-join-before-migration branch from e4e1e78 to 761a688 Compare November 14, 2023 11:11
@blizzz blizzz merged commit 281ac50 into master Nov 14, 2023
48 of 50 checks passed
@blizzz blizzz deleted the fix/noid/no-join-before-migration branch November 14, 2023 13:37
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants