Skip to content

Fix reading blob data as resource - #33129

Merged
blizzz merged 1 commit into
masterfrom
fix-reading-blob-as-resources
Jul 25, 2022
Merged

Fix reading blob data as resource#33129
blizzz merged 1 commit into
masterfrom
fix-reading-blob-as-resources

Conversation

@tcitworld

@tcitworldtcitworld commented Jul 6, 2022

Copy link
Copy Markdown
Member

PostgreSQL returns data as resource when using IQueryBuilder::PARAM_LOB (which is used for QBMapper).

Previously we just converted this resource using settype, which produced things like "Resource id #14" instead of the actual resource data.

Now we read the stream correctly if the returned data is a resource

See context at #22472

Fixes#22439

@tcitworldtcitworld added bug 3. to review Waiting for reviews php Pull requests that update Php code labels Jul 6, 2022
@tcitworldtcitworld added this to the Nextcloud 25 milestone Jul 6, 2022
@tcitworld
tcitworld requested review from a team, ChristophWurst, PVince81, blizzz, come-nc and nickvergessen and removed request for a teamJuly 6, 2022 07:58
@tcitworld

tcitworld commented Jul 6, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable24

@tcitworld

tcitworld commented Jul 6, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable23

@tcitworld

tcitworld commented Jul 6, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable22

@tcitworld

tcitworld commented Jul 6, 2022

Copy link
Copy Markdown
MemberAuthor

@szaimen If you can try this patch

@nickvergessen

nickvergessen commented Jul 6, 2022

Copy link
Copy Markdown
Member

Can we get a test added?

@tcitworld
tcitworldforce-pushed the fix-reading-blob-as-resources branch 2 times, most recently from fdab572 to be520d7CompareJuly 6, 2022 13:03
@tcitworld

tcitworld commented Jul 6, 2022

Copy link
Copy Markdown
MemberAuthor

There you go

nickvergessen
nickvergessen approved these changes Jul 6, 2022
View reviewed changes

@nickvergessennickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I actually meant a real test reading stuff from the database, but fine by me for now

@tcitworld

tcitworld commented Jul 7, 2022

Copy link
Copy Markdown
MemberAuthor

Where would I create such a functional test? Still in AppFramework\DB?

@nickvergessen

nickvergessen commented Jul 7, 2022

Copy link
Copy Markdown
Member

Yes, tests/lib/AppFramework/DB/EntityTest.php
But since there are no tests yet, I guess it's quite some overhead

@blizzzblizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 8, 2022
@blizzz

blizzz commented Jul 8, 2022

Copy link
Copy Markdown
Member

Linter is unhappy

@tcitworld
tcitworldforce-pushed the fix-reading-blob-as-resources branch from be520d7 to 89c543fCompareJuly 11, 2022 08:35
@tcitworld

tcitworld commented Jul 11, 2022

Copy link
Copy Markdown
MemberAuthor

Made it happy

@github-actions

github-actionsBot commented Jul 11, 2022

Copy link
Copy Markdown
Contributor

Possible performance regression detected

Show Output
1 queries added
= /remote.php/dav/files/test
≠ /remote.php/dav/files/test/test.txt with 1 queries added
+ UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)
≠ /remote.php/dav/files/test/many_files with 1 queries removed
- UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)
= /remote.php/dav/files/test/new_file.txt
≠ /remote.php/dav/files/test/new_file.txt with 1 queries added
+ UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)

@blizzz

blizzz commented Jul 22, 2022

Copy link
Copy Markdown
Member

/compile amend /

@nextcloud-command
nextcloud-commandforce-pushed the fix-reading-blob-as-resources branch from 89c543f to 6f65b50CompareJuly 22, 2022 21:24
@tcitworld

tcitworld commented Jul 23, 2022

Copy link
Copy Markdown
MemberAuthor

Why the compile amend? :(

@tcitworld@nickvergessen
Fix reading blob data as resource
1d30fb7
PostgreSQL returns data as resource when using IQueryBuilder::PARAM_LOB
(which is used for QBMapper).
Previously we just converted this resource using settype, which produced
things like "Resource id #14" instead of the actual resource data.
Now we read the stream correctly if the returned data is a resource
See context at #22472Fixes#22439
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
@nickvergessen
nickvergessenforce-pushed the fix-reading-blob-as-resources branch from 6f65b50 to 1d30fb7CompareJuly 25, 2022 07:46
@nickvergessen

nickvergessen commented Jul 25, 2022

Copy link
Copy Markdown
Member

It was just the wrong command, I guess he wanted to rebase because that is what github complained about.

@blizzz

blizzz commented Jul 25, 2022•
edited
Loading

Copy link
Copy Markdown
Member

yeah, sorry, was rushing through review requests

@blizzz
blizzz merged commit bbe15b4 into masterJul 25, 2022
@blizzz
blizzz deleted the fix-reading-blob-as-resources branch July 25, 2022 15:56
This was referenced Jul 25, 2022
Merged
Merged
Closed
@skjnldsvskjnldsv mentioned this pull request Aug 11, 2022
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessennickvergessennickvergessen approved these changes
@ChristophWurstChristophWurstChristophWurst approved these changes
@come-nccome-nccome-nc approved these changes
@blizzzblizzzAwaiting requested review from blizzz
@PVince81PVince81Awaiting requested review from PVince81

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugphpPull requests that update Php code

Projects

None yet

Milestone

Nextcloud 25

Development

Successfully merging this pull request may close these issues.

Contacts sync broken since NC 19upgrade

5 participants

@tcitworld@nickvergessen@blizzz@ChristophWurst@come-nc