-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
HHH-19566 Respect association target entity/collection filters in nested isAffectedByEnabledFilters #11571
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
Open
beikov
wants to merge
2
commits into
hibernate:main
Choose a base branch
from
beikov:HHH-19566
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+111
−16
Open
HHH-19566 Respect association target entity/collection filters in nested isAffectedByEnabledFilters #11571
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
82 changes: 82 additions & 0 deletions
82
...nate-core/src/test/java/org/hibernate/orm/test/where/annotations/ManyToOneFilterTest.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * Copyright Red Hat Inc. and Hibernate Authors | ||
| */ | ||
| package org.hibernate.orm.test.where.annotations; | ||
|
|
||
| import jakarta.persistence.Entity; | ||
| import jakarta.persistence.Id; | ||
| import jakarta.persistence.JoinColumn; | ||
| import jakarta.persistence.ManyToOne; | ||
| import jakarta.persistence.Table; | ||
| import org.hibernate.EntityFilterException; | ||
| import org.hibernate.annotations.Filter; | ||
| import org.hibernate.annotations.FilterDef; | ||
| import org.hibernate.testing.orm.junit.DomainModel; | ||
| import org.hibernate.testing.orm.junit.SessionFactory; | ||
| import org.hibernate.testing.orm.junit.SessionFactoryScope; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.jupiter.api.Assertions.fail; | ||
|
|
||
| @SessionFactory | ||
| @DomainModel(annotatedClasses = | ||
| {ManyToOneFilterTest.X.class, | ||
| ManyToOneFilterTest.Y.class}) | ||
| class ManyToOneFilterTest { | ||
| @Test void test(SessionFactoryScope scope) { | ||
| scope.inTransaction(session -> { | ||
| Y y = new Y(); | ||
| X x = new X(); | ||
| x.id = -1; | ||
| y.x = x; | ||
| session.persist(x); | ||
| session.persist(y); | ||
| }); | ||
| scope.inTransaction(session -> { | ||
| Y y = session.find(Y.class, 0L); | ||
| assertNotNull(y.x); | ||
| }); | ||
| try { | ||
| scope.inTransaction( session -> { | ||
| session.enableFilter( "filter" ).validate(); | ||
| var graph = session.createEntityGraph(Y.class); | ||
| Y y = session.find( graph, 0L ); | ||
| } ); | ||
| fail(); | ||
| } | ||
| catch (EntityFilterException efe) { | ||
| //required | ||
| } | ||
| try { | ||
| scope.inTransaction(session -> { | ||
| session.enableFilter( "filter" ).validate(); | ||
| Y y = session.find(Y.class, 0L); | ||
Check noticeCode scanning / CodeQL Unread local variable Note test
Variable 'Y y' is never read.
|
||
| }); | ||
| fail(); | ||
| } | ||
| catch (EntityFilterException efe) { | ||
| //required | ||
| } | ||
| } | ||
|
|
||
| @Entity | ||
| @Table(name = "XX") | ||
| @FilterDef(name = "filter", applyToLoadByKey = true) | ||
| @Filter(name = "filter", condition = "id>0") | ||
| static class X { | ||
| @Id | ||
| long id; | ||
| } | ||
| @Entity | ||
| @Table(name = "YY") | ||
| static class Y { | ||
| @Id | ||
| long id; | ||
| String name; | ||
| @ManyToOne | ||
| @JoinColumn(name = "xx") | ||
| X x; | ||
| } | ||
| } | ||
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.
Check notice
Code scanning / CodeQL
Unread local variable Note test