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.

Sign up for GitHub

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

Jump to bottom

fix: add workaround for oci and limit queries #38016

Merged
merged 1 commit into from
May 3, 2023
Merged

fix: add workaround for oci and limit queries #38016

merged 1 commit into from
May 3, 2023

Conversation

kesselb
Copy link
Contributor

@kesselb kesselb commented May 2, 2023 •
edited
Loading

Summary

DBAL uses a helper column "doctrine_rownum" for oci queries with limit and offset1.
The column is also present in the query result and qbmapper tries to set it for the entity.

1) OCA\EndToEndEncryption\Tests\Unit\Db\LockMapperTest::testFindAllLocksOlderThan
BadFunctionCallException: dOCTRINEROWNUM is not a valid attribute

/home/runner/work/end_to_end_encryption/end_to_end_encryption/lib/public/AppFramework/Db/Entity.php:138
/home/runner/work/end_to_end_encryption/end_to_end_encryption/lib/public/AppFramework/Db/Entity.php:167
/home/runner/work/end_to_end_encryption/end_to_end_encryption/lib/public/AppFramework/Db/Entity.php:75
/home/runner/work/end_to_end_encryption/end_to_end_encryption/lib/public/AppFramework/Db/QBMapper.php:320
/home/runner/work/end_to_end_encryption/end_to_end_encryption/lib/public/AppFramework/Db/QBMapper.php:338
/home/runner/work/end_to_end_encryption/end_to_end_encryption/apps/end_to_end_encryption/lib/Db/LockMapper.php:70
/home/runner/work/end_to_end_encryption/end_to_end_encryption/apps/end_to_end_encryption/tests/Unit/Db/LockMapperTest.php:110

TODO

  • CI

Checklist

Footnotes

  1. https://github.com/doctrine/dbal/pull/2509 ↩

@kesselb
fix: add workaround for oci and limit queries
eecdb62 
DBAL uses a helper column "doctrine_rownum" for top-n queries

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb self-assigned this May 2, 2023
@kesselb kesselb added 3. to review Waiting for reviews bug labels May 2, 2023
@kesselb kesselb requested review from ChristophWurst and removed request for ChristophWurst May 2, 2023 12:28
@kesselb kesselb marked this pull request as ready for review May 2, 2023 12:28
ChristophWurst
ChristophWurst approved these changes May 2, 2023
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

🥲 👍

@kesselb kesselb requested a review from nickvergessen May 2, 2023 12:58
nickvergessen
nickvergessen approved these changes May 2, 2023
View reviewed changes
Copy link
Member

@nickvergessen nickvergessen left a comment

Choose a reason for hiding this comment

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

surprise pikachu

@kesselb kesselb merged commit db73534 into master May 3, 2023
@kesselb kesselb deleted the oracle-limit-workaround branch May 3, 2023 21:07
@kesselb
Copy link
Contributor Author

kesselb commented May 3, 2023

/backport to stable26

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request May 3, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes

@ChristophWurst ChristophWurst ChristophWurst approved these changes

Assignees

@kesselb kesselb

Labels
3. to review Waiting for reviews bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kesselb @nickvergessen @ChristophWurst