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

[#1278, #1343] OrderBy support in simplified JPA queries for 1.5.x #1395

Merged
merged 6 commits into from
Apr 2, 2022

Conversation

xael-fry
Copy link
Member

@xael-fry xael-fry commented Apr 2, 2022

Pull Request Checklist

Helpful things

Fixes

Fixes #xxxx

Purpose

What does this PR do?

Background Context

Why did you take this approach?

References

Are there any relevant issues / PRs / mailing lists discussions?

xabolcs and others added 6 commits March 23, 2022 19:17
…om old_master to master

Commit b91659a
("[playframework#878] Add OrderBy support in simplified queries") was never ported
to master.

The changes from Pull Request playframework#504 touched some parts of it,
therefore half of the OrderBy change sneaked in to the "new" master.

Fixing by removing the irrelevant OrderBy change.

In method findByToJPQL in file framework/src/play/db/jpa/JPQL.java:
- old_master merge commit has only StringBuilder related change
- master "merge" commit has this OrderBy change too

old_master merge commit: b6797a1
ported master commit: 97c54d2

Fix: 97c54d2 ("Merge pull request playframework#504 from marcelmay/lighthouse-1502-patch")
[javac]
/home/travis/build/playframework/play1/framework/test-src/play/db/jpa/JPQLTest.java:20:
error: constructor JPQL in class JPQL cannot be applied to given types;
    [javac] 		jpql = new JPQL(null);
    [javac] 		       ^
    [javac]   required: no arguments
    [javac]   found: <null>
@xael-fry xael-fry changed the title Pr/1343 [#1278, #1343] OrderBy support in simplified JPA queries for 1.5.x Apr 2, 2022
@xael-fry xael-fry added this to the 1.7.0 milestone Apr 2, 2022
@xael-fry xael-fry added the defect label Apr 2, 2022
@xael-fry xael-fry merged commit b791ed8 into playframework:master Apr 2, 2022
@xael-fry xael-fry deleted the pr/1343 branch April 2, 2022 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants