GitHub issue #1278: OrderBy support in simplified JPA queries for 1.5.x #1343
Conversation
This file contains 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
|
Ohh, looks like I have to fix the test too. 🙃 |
…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")
(cherry picked from commit b91659a)
… documentation (cherry picked from commit 1e76061)
(cherry picked from commit 40dffac)
[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>
xabolcs
force-pushed
the
github-issue-1278-orderby-support-in-simplified-jpa-1-5-x
branch
from
bb30150 to
d65b177
Compare
|
Hi @xael-fry , this pull request is a fix for a regression, detailed in issue #1278. May I ask to include that issue for Play 1.7.0? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull Request Checklist
Helpful things
Purpose
This pull request:
old_master->masterport of an old, unrelated pull request ([#1502] JPA/Hibernate warns about use of deprecated positional parameter #504) where some parts of "OrderBy" change sneaked in[#878] Add OrderBy support in simplified queriescommits which were never ported to newmasterBackground Context
I voted for creating a preparing commit to make the cherry picking as seamless as possible.
I added
(cherry picked from commit xxxxxx)the cherry picked commits to make it clear this is anold_master->masterportI could add a whitespace fixup commit, as the original commits used TABs for indentation.
References
All details are in the original issue: #1278