HHH-15902 Add test for issue
This commit is contained in:
parent
b037047e24
commit
3765837b9e
|
@ -0,0 +1,154 @@
|
||||||
|
package org.hibernate.orm.test.where.annotations;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.hibernate.annotations.Where;
|
||||||
|
|
||||||
|
import org.hibernate.testing.TestForIssue;
|
||||||
|
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
|
||||||
|
import org.hibernate.testing.orm.junit.Jpa;
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import jakarta.persistence.CascadeType;
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.FetchType;
|
||||||
|
import jakarta.persistence.Id;
|
||||||
|
import jakarta.persistence.JoinColumn;
|
||||||
|
import jakarta.persistence.ManyToOne;
|
||||||
|
import jakarta.persistence.OneToMany;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
|
||||||
|
|
||||||
|
@Jpa(
|
||||||
|
annotatedClasses = {
|
||||||
|
EagerManyToOne2Test.Child.class,
|
||||||
|
EagerManyToOne2Test.Parent.class
|
||||||
|
}
|
||||||
|
)
|
||||||
|
@TestForIssue(jiraKey = "HHH-15902")
|
||||||
|
public class EagerManyToOne2Test {
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
public void tearDown(EntityManagerFactoryScope scope) {
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
entityManager.createNativeQuery( "delete from children" ).executeUpdate();
|
||||||
|
entityManager.createQuery( "delete from Parent" ).executeUpdate();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFindParent(EntityManagerFactoryScope scope) {
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = new Parent( 1l, "Fab" );
|
||||||
|
Child child = new Child( 2l, new Date() );
|
||||||
|
parent.addChild( child );
|
||||||
|
entityManager.persist( parent );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = entityManager.find( Parent.class, 1 );
|
||||||
|
assertThat( parent ).isNotNull();
|
||||||
|
assertThat( parent.children.size() ).isEqualTo( 0 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
|
||||||
|
List<Child> children = entityManager.createQuery( "select c from Child c", Child.class )
|
||||||
|
.getResultList();
|
||||||
|
assertThat( children.size() ).isEqualTo( 1 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFindParent2(EntityManagerFactoryScope scope) {
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = new Parent( 1l, "Fab" );
|
||||||
|
Child child = new Child( 2l, new Date() );
|
||||||
|
Child child2 = new Child( 3l, null );
|
||||||
|
parent.addChild( child );
|
||||||
|
parent.addChild( child2 );
|
||||||
|
entityManager.persist( parent );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = entityManager.find( Parent.class, 1 );
|
||||||
|
assertThat( parent ).isNotNull();
|
||||||
|
assertThat( parent.children.size() ).isEqualTo( 1 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
|
||||||
|
List<Child> children = entityManager.createQuery( "select c from Child c", Child.class )
|
||||||
|
.getResultList();
|
||||||
|
assertThat( children.size() ).isEqualTo( 2 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity(name = "Child")
|
||||||
|
@Table(name = "children")
|
||||||
|
public static class Child {
|
||||||
|
@Id
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@JoinColumn(name = "parent_id", nullable = false, updatable = false)
|
||||||
|
@ManyToOne(fetch = FetchType.EAGER)
|
||||||
|
private Parent parent;
|
||||||
|
|
||||||
|
@Column(name = "deleted_at")
|
||||||
|
private Date deletedAt;
|
||||||
|
|
||||||
|
public Child() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Child(Long id, Date deletedAt) {
|
||||||
|
this.id = id;
|
||||||
|
this.deletedAt = deletedAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setParent(Parent parent) {
|
||||||
|
this.parent = parent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity(name = "Parent")
|
||||||
|
@Table(name = "parents")
|
||||||
|
public static class Parent {
|
||||||
|
@Id
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
|
||||||
|
@Where(clause = "deleted_at IS NULL")
|
||||||
|
private List<Child> children = new ArrayList<>();
|
||||||
|
|
||||||
|
public Parent() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Parent(Long id, String name) {
|
||||||
|
this.id = id;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addChild(Child child) {
|
||||||
|
children.add( child );
|
||||||
|
child.setParent( this );
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,153 @@
|
||||||
|
package org.hibernate.orm.test.where.annotations;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.hibernate.annotations.Where;
|
||||||
|
import org.hibernate.cfg.AvailableSettings;
|
||||||
|
|
||||||
|
import org.hibernate.testing.TestForIssue;
|
||||||
|
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
|
||||||
|
import org.hibernate.testing.orm.junit.Jpa;
|
||||||
|
import org.hibernate.testing.orm.junit.Setting;
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import jakarta.persistence.CascadeType;
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.FetchType;
|
||||||
|
import jakarta.persistence.Id;
|
||||||
|
import jakarta.persistence.JoinColumn;
|
||||||
|
import jakarta.persistence.ManyToOne;
|
||||||
|
import jakarta.persistence.OneToMany;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
|
||||||
|
|
||||||
|
@Jpa(
|
||||||
|
annotatedClasses = {
|
||||||
|
EagerManyToOne3Test.Child.class,
|
||||||
|
EagerManyToOne3Test.Parent.class
|
||||||
|
})
|
||||||
|
@TestForIssue(jiraKey = "HHH-15902")
|
||||||
|
public class EagerManyToOne3Test {
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
public void tearDown(EntityManagerFactoryScope scope) {
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
entityManager.createNativeQuery( "delete from children" ).executeUpdate();
|
||||||
|
entityManager.createQuery( "delete from Parent" ).executeUpdate();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFindParent(EntityManagerFactoryScope scope) {
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = new Parent( 1l, "Fab" );
|
||||||
|
Child child = new Child( 2l, new Date() );
|
||||||
|
parent.addChild( child );
|
||||||
|
entityManager.persist( parent );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = entityManager.find( Parent.class, 1 );
|
||||||
|
assertThat( parent ).isNotNull();
|
||||||
|
assertThat( parent.children.size() ).isEqualTo( 0 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
List<Child> children = entityManager.createQuery( "select c from Child c", Child.class )
|
||||||
|
.getResultList();
|
||||||
|
assertThat( children.size() ).isEqualTo( 0 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFindParent2(EntityManagerFactoryScope scope) {
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = new Parent( 1l, "Fab" );
|
||||||
|
Child child = new Child( 2l, new Date() );
|
||||||
|
Child child2 = new Child( 3l, null );
|
||||||
|
parent.addChild( child );
|
||||||
|
parent.addChild( child2 );
|
||||||
|
entityManager.persist( parent );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = entityManager.find( Parent.class, 1 );
|
||||||
|
assertThat( parent ).isNotNull();
|
||||||
|
assertThat( parent.children.size() ).isEqualTo( 1 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
List<Child> children = entityManager.createQuery( "select c from Child c", Child.class )
|
||||||
|
.getResultList();
|
||||||
|
assertThat( children.size() ).isEqualTo( 1 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity(name = "Child")
|
||||||
|
@Table(name = "children")
|
||||||
|
@Where(clause = "deleted_at IS NULL")
|
||||||
|
public static class Child {
|
||||||
|
@Id
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@JoinColumn(name = "parent_id", nullable = false, updatable = false)
|
||||||
|
@ManyToOne(fetch = FetchType.EAGER)
|
||||||
|
private Parent parent;
|
||||||
|
|
||||||
|
@Column(name = "deleted_at")
|
||||||
|
private Date deletedAt;
|
||||||
|
|
||||||
|
public Child() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Child(Long id, Date deletedAt) {
|
||||||
|
this.id = id;
|
||||||
|
this.deletedAt = deletedAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setParent(Parent parent) {
|
||||||
|
this.parent = parent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity(name = "Parent")
|
||||||
|
@Table(name = "parents")
|
||||||
|
public static class Parent {
|
||||||
|
@Id
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
|
||||||
|
private List<Child> children = new ArrayList<>();
|
||||||
|
|
||||||
|
public Parent() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Parent(Long id, String name) {
|
||||||
|
this.id = id;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addChild(Child child) {
|
||||||
|
children.add( child );
|
||||||
|
child.setParent( this );
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,141 @@
|
||||||
|
package org.hibernate.orm.test.where.annotations;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.hibernate.annotations.Where;
|
||||||
|
import org.hibernate.cfg.AvailableSettings;
|
||||||
|
|
||||||
|
import org.hibernate.testing.TestForIssue;
|
||||||
|
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
|
||||||
|
import org.hibernate.testing.orm.junit.Jpa;
|
||||||
|
import org.hibernate.testing.orm.junit.Setting;
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import jakarta.persistence.CascadeType;
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.FetchType;
|
||||||
|
import jakarta.persistence.Id;
|
||||||
|
import jakarta.persistence.JoinColumn;
|
||||||
|
import jakarta.persistence.ManyToOne;
|
||||||
|
import jakarta.persistence.OneToMany;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
|
||||||
|
|
||||||
|
@Jpa(
|
||||||
|
annotatedClasses = {
|
||||||
|
EagerManyToOneTest.Child.class,
|
||||||
|
EagerManyToOneTest.Parent.class
|
||||||
|
},
|
||||||
|
properties = @Setting( name = AvailableSettings.USE_ENTITY_WHERE_CLAUSE_FOR_COLLECTIONS, value = "false")
|
||||||
|
|
||||||
|
)
|
||||||
|
@TestForIssue(jiraKey = "HHH-15902")
|
||||||
|
public class EagerManyToOneTest {
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
public void setUp(EntityManagerFactoryScope scope) {
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = new Parent( 1l, "Fab" );
|
||||||
|
Child child = new Child( 2l, new Date() );
|
||||||
|
parent.addChild( child );
|
||||||
|
entityManager.persist( parent );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
public void tearDown(EntityManagerFactoryScope scope) {
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
entityManager.createNativeQuery( "delete from children" ).executeUpdate();
|
||||||
|
entityManager.createQuery( "delete from Parent" ).executeUpdate();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFindParent(EntityManagerFactoryScope scope) {
|
||||||
|
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Parent parent = entityManager.find( Parent.class, 1 );
|
||||||
|
assertThat( parent ).isNotNull();
|
||||||
|
assertThat( parent.children.size() ).isEqualTo( 1 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
Child child = entityManager.find( Child.class, 2 );
|
||||||
|
assertThat( child ).isNull();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
scope.inTransaction(
|
||||||
|
entityManager -> {
|
||||||
|
|
||||||
|
List<EagerManyToOne2Test.Child> children = entityManager.createQuery( "select c from Child c", EagerManyToOne2Test.Child.class )
|
||||||
|
.getResultList();
|
||||||
|
assertThat( children.size() ).isEqualTo( 0 );
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity(name = "Child")
|
||||||
|
@Table(name = "children")
|
||||||
|
@Where(clause = "deleted_at IS NULL")
|
||||||
|
public static class Child {
|
||||||
|
@Id
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@JoinColumn(name = "parent_id", nullable = false, updatable = false)
|
||||||
|
@ManyToOne(fetch = FetchType.EAGER)
|
||||||
|
private Parent parent;
|
||||||
|
|
||||||
|
@Column(name = "deleted_at")
|
||||||
|
private Date deletedAt;
|
||||||
|
|
||||||
|
public Child() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Child(Long id, Date deletedAt) {
|
||||||
|
this.id = id;
|
||||||
|
this.deletedAt = deletedAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setParent(Parent parent) {
|
||||||
|
this.parent = parent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity(name = "Parent")
|
||||||
|
@Table(name = "parents")
|
||||||
|
public static class Parent {
|
||||||
|
@Id
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
|
||||||
|
private List<Child> children = new ArrayList<>();
|
||||||
|
|
||||||
|
public Parent() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Parent(Long id, String name) {
|
||||||
|
this.id = id;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addChild(Child child) {
|
||||||
|
children.add( child );
|
||||||
|
child.setParent( this );
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue