HHH-16472 Add test for issue

This commit is contained in:
Marco Belladelli 2023-05-03 12:43:15 +02:00
parent 0980b78d5e
commit c0b95a16e6
No known key found for this signature in database
GPG Key ID: D1D0C3030AE3AA35
2 changed files with 682 additions and 0 deletions

View File

@ -0,0 +1,320 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.orm.test.inheritance;
import java.util.List;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.Jira;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import jakarta.persistence.DiscriminatorColumn;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Join;
import jakarta.persistence.criteria.JoinType;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Root;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Marco Belladelli
*/
@SessionFactory
@DomainModel( annotatedClasses = {
TreatedLeftJoinInheritanceTest.ParentEntity.class,
TreatedLeftJoinInheritanceTest.SingleTableEntity.class,
TreatedLeftJoinInheritanceTest.SingleTableSubEntity.class,
TreatedLeftJoinInheritanceTest.JoinedEntity.class,
TreatedLeftJoinInheritanceTest.JoinedSubEntity.class,
TreatedLeftJoinInheritanceTest.TablePerClassEntity.class,
TreatedLeftJoinInheritanceTest.TablePerClassSubEntity.class,
TreatedLeftJoinInheritanceTest.ChildEntity.class
} )
@Jira( "https://hibernate.atlassian.net/browse/HHH-16472" )
public class TreatedLeftJoinInheritanceTest {
@BeforeAll
public void setUp(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final ChildEntity childEntity = new ChildEntity( 1L );
session.persist( childEntity );
final SingleTableSubEntity singleTableSubEntity = new SingleTableSubEntity( childEntity );
session.persist( singleTableSubEntity );
final JoinedSubEntity joinedSubEntity = new JoinedSubEntity( childEntity );
session.persist( joinedSubEntity );
final TablePerClassSubEntity tablePerClassSubEntity = new TablePerClassSubEntity( childEntity );
session.persist( tablePerClassSubEntity );
final ParentEntity parentEntityA = new ParentEntity( 1L, "entity1_a", null, null, null );
session.persist( parentEntityA );
final ParentEntity parentEntityB = new ParentEntity(
2L,
"entity1_b",
singleTableSubEntity,
joinedSubEntity,
tablePerClassSubEntity
);
session.persist( parentEntityB );
} );
}
@AfterAll
public void tearDown(SessionFactoryScope scope) {
scope.inTransaction( session -> {
session.createMutationQuery( "delete from ParentEntity" ).executeUpdate();
session.createMutationQuery( "delete from SingleTableEntity" ).executeUpdate();
session.createMutationQuery( "delete from JoinedEntity" ).executeUpdate();
session.createMutationQuery( "delete from TablePerClassEntity" ).executeUpdate();
session.createMutationQuery( "delete from ChildEntity" ).executeUpdate();
} );
}
@Test
public void testSingleTable(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final ChildEntity childEntity = session.find( ChildEntity.class, 1L );
final CriteriaBuilder cb = session.getCriteriaBuilder();
final CriteriaQuery<ParentEntity> cq = cb.createQuery( ParentEntity.class );
final Root<ParentEntity> root = cq.from( ParentEntity.class );
final Join<ParentEntity, SingleTableEntity> join = root.join(
session.getMetamodel()
.entity( ParentEntity.class )
.getSingularAttribute( "singleTableEntity", SingleTableEntity.class ),
JoinType.LEFT
);
final Join<ParentEntity, SingleTableSubEntity> treatedJoin = cb.treat(
join,
SingleTableSubEntity.class
);
final Path<?> childPath = treatedJoin.get( "child" );
cq.select( root ).where( cb.or(
cb.equal( childPath, childEntity ),
childPath.isNull()
) ).orderBy( cb.asc( root.get( "id" ) ) );
final TypedQuery<ParentEntity> query = session.createQuery( cq );
final List<ParentEntity> resultList = query.getResultList();
assertThat( resultList ).hasSize( 2 );
assertThat( resultList.get( 0 ).getSingleTableEntity() ).isNull();
final SingleTableEntity subEntity = resultList.get( 1 ).getSingleTableEntity();
assertThat( subEntity ).isInstanceOf( SingleTableSubEntity.class );
assertThat( ( (SingleTableSubEntity) subEntity ).getChild().getId() ).isEqualTo( 1L );
} );
}
@Test
public void testJoined(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final ChildEntity childEntity = session.find( ChildEntity.class, 1L );
final CriteriaBuilder cb = session.getCriteriaBuilder();
final CriteriaQuery<ParentEntity> cq = cb.createQuery( ParentEntity.class );
final Root<ParentEntity> root = cq.from( ParentEntity.class );
final Join<ParentEntity, JoinedEntity> join = root.join(
session.getMetamodel()
.entity( ParentEntity.class )
.getSingularAttribute( "joinedEntity", JoinedEntity.class ),
JoinType.LEFT
);
final Join<ParentEntity, JoinedSubEntity> treatedJoin = cb.treat(
join,
JoinedSubEntity.class
);
final Path<?> childPath = treatedJoin.get( "child" );
cq.select( root ).where( cb.or(
cb.equal( childPath, childEntity ),
childPath.isNull()
) ).orderBy( cb.asc( root.get( "id" ) ) );
final TypedQuery<ParentEntity> query = session.createQuery( cq );
final List<ParentEntity> resultList = query.getResultList();
assertThat( resultList ).hasSize( 2 );
assertThat( resultList.get( 0 ).getJoinedEntity() ).isNull();
final JoinedEntity subEntity = resultList.get( 1 ).getJoinedEntity();
assertThat( subEntity ).isInstanceOf( JoinedSubEntity.class );
assertThat( ( (JoinedSubEntity) subEntity ).getChild().getId() ).isEqualTo( 1L );
} );
}
@Test
public void testTablePerClass(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final ChildEntity childEntity = session.find( ChildEntity.class, 1L );
final CriteriaBuilder cb = session.getCriteriaBuilder();
final CriteriaQuery<ParentEntity> cq = cb.createQuery( ParentEntity.class );
final Root<ParentEntity> root = cq.from( ParentEntity.class );
final Join<ParentEntity, TablePerClassEntity> join = root.join(
session.getMetamodel()
.entity( ParentEntity.class )
.getSingularAttribute( "tablePerClassEntity", TablePerClassEntity.class ),
JoinType.LEFT
);
final Join<ParentEntity, TablePerClassSubEntity> treatedJoin = cb.treat(
join,
TablePerClassSubEntity.class
);
final Path<?> childPath = treatedJoin.get( "child" );
cq.select( root ).where( cb.or(
cb.equal( childPath, childEntity ),
childPath.isNull()
) ).orderBy( cb.asc( root.get( "id" ) ) );
final TypedQuery<ParentEntity> query = session.createQuery( cq );
final List<ParentEntity> resultList = query.getResultList();
assertThat( resultList ).hasSize( 2 );
assertThat( resultList.get( 0 ).getTablePerClassEntity() ).isNull();
final TablePerClassEntity subEntity = resultList.get( 1 ).getTablePerClassEntity();
assertThat( subEntity ).isInstanceOf( TablePerClassSubEntity.class );
assertThat( ( (TablePerClassSubEntity) subEntity ).getChild().getId() ).isEqualTo( 1L );
} );
}
@Entity( name = "ParentEntity" )
public static class ParentEntity {
@Id
private Long id;
private String name;
@ManyToOne
private SingleTableEntity singleTableEntity;
@ManyToOne
private JoinedEntity joinedEntity;
@ManyToOne
private TablePerClassEntity tablePerClassEntity;
public ParentEntity() {
}
public ParentEntity(
Long id,
String name,
SingleTableEntity singleTableEntity,
JoinedEntity joinedEntity,
TablePerClassEntity tablePerClassEntity) {
this.id = id;
this.name = name;
this.singleTableEntity = singleTableEntity;
this.joinedEntity = joinedEntity;
this.tablePerClassEntity = tablePerClassEntity;
}
public SingleTableEntity getSingleTableEntity() {
return singleTableEntity;
}
public JoinedEntity getJoinedEntity() {
return joinedEntity;
}
public TablePerClassEntity getTablePerClassEntity() {
return tablePerClassEntity;
}
}
@Entity( name = "SingleTableEntity" )
@Inheritance( strategy = InheritanceType.SINGLE_TABLE )
@DiscriminatorColumn( name = "disc_col" )
public static class SingleTableEntity {
@Id
@GeneratedValue
private Long id;
}
@Entity( name = "SingleTableSubEntity" )
public static class SingleTableSubEntity extends SingleTableEntity {
@ManyToOne
private ChildEntity child;
public SingleTableSubEntity() {
}
public SingleTableSubEntity(ChildEntity child) {
this.child = child;
}
public ChildEntity getChild() {
return child;
}
}
@Entity( name = "JoinedEntity" )
@Inheritance( strategy = InheritanceType.JOINED )
public static class JoinedEntity {
@Id
@GeneratedValue
private Long id;
}
@Entity( name = "JoinedSubEntity" )
public static class JoinedSubEntity extends JoinedEntity {
@ManyToOne
private ChildEntity child;
public JoinedSubEntity() {
}
public JoinedSubEntity(ChildEntity child) {
this.child = child;
}
public ChildEntity getChild() {
return child;
}
}
@Entity( name = "TablePerClassEntity" )
@Inheritance( strategy = InheritanceType.TABLE_PER_CLASS )
public static class TablePerClassEntity {
@Id
@GeneratedValue
private Long id;
}
@Entity( name = "TablePerClassSubEntity" )
public static class TablePerClassSubEntity extends TablePerClassEntity {
@ManyToOne
private ChildEntity child;
public TablePerClassSubEntity() {
}
public TablePerClassSubEntity(ChildEntity child) {
this.child = child;
}
public ChildEntity getChild() {
return child;
}
}
@Entity( name = "ChildEntity" )
public static class ChildEntity {
@Id
private Long id;
public ChildEntity() {
}
public ChildEntity(Long id) {
this.id = id;
}
public Long getId() {
return id;
}
}
}

View File

@ -0,0 +1,362 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.orm.test.inheritance;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.Jira;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import jakarta.persistence.DiscriminatorColumn;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CollectionJoin;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.JoinType;
import jakarta.persistence.criteria.ListJoin;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Root;
import jakarta.persistence.criteria.SetJoin;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Marco Belladelli
*/
@SessionFactory
@DomainModel( annotatedClasses = {
TreatedLeftPluralJoinInheritanceTest.ParentEntity.class,
TreatedLeftPluralJoinInheritanceTest.SingleTableEntity.class,
TreatedLeftPluralJoinInheritanceTest.SingleTableSubEntity.class,
TreatedLeftPluralJoinInheritanceTest.JoinedEntity.class,
TreatedLeftPluralJoinInheritanceTest.JoinedSubEntity.class,
TreatedLeftPluralJoinInheritanceTest.TablePerClassEntity.class,
TreatedLeftPluralJoinInheritanceTest.TablePerClassSubEntity.class,
TreatedLeftPluralJoinInheritanceTest.ChildEntity.class
} )
@Jira( "https://hibernate.atlassian.net/browse/HHH-16472" )
public class TreatedLeftPluralJoinInheritanceTest {
@BeforeAll
public void setUp(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final ChildEntity childEntity = new ChildEntity( 1L );
session.persist( childEntity );
final SingleTableSubEntity singleTableSubEntity = new SingleTableSubEntity( childEntity );
final JoinedSubEntity joinedSubEntity = new JoinedSubEntity( childEntity );
final TablePerClassSubEntity tablePerClassSubEntity = new TablePerClassSubEntity( childEntity );
final ParentEntity parentEntityA = new ParentEntity( 1L, "entity1_a", null, null, null );
session.persist( parentEntityA );
final ParentEntity parentEntityB = new ParentEntity(
2L,
"entity1_b",
List.of( singleTableSubEntity ),
Set.of( joinedSubEntity ),
List.of( tablePerClassSubEntity )
);
singleTableSubEntity.setParentEntity( parentEntityB );
session.persist( singleTableSubEntity );
joinedSubEntity.setParentEntity( parentEntityB );
session.persist( joinedSubEntity );
tablePerClassSubEntity.setParentEntity( parentEntityB );
session.persist( tablePerClassSubEntity );
session.persist( parentEntityB );
} );
}
@AfterAll
public void tearDown(SessionFactoryScope scope) {
scope.inTransaction( session -> {
session.createMutationQuery( "delete from SingleTableEntity" ).executeUpdate();
session.createMutationQuery( "delete from JoinedEntity" ).executeUpdate();
session.createMutationQuery( "delete from TablePerClassEntity" ).executeUpdate();
session.createMutationQuery( "delete from ParentEntity" ).executeUpdate();
session.createMutationQuery( "delete from ChildEntity" ).executeUpdate();
} );
}
@Test
public void testSingleTable(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final ChildEntity childEntity = session.find( ChildEntity.class, 1L );
final CriteriaBuilder cb = session.getCriteriaBuilder();
final CriteriaQuery<ParentEntity> cq = cb.createQuery( ParentEntity.class );
final Root<ParentEntity> root = cq.from( ParentEntity.class );
final ListJoin<ParentEntity, SingleTableEntity> listJoin = root.join(
session.getMetamodel()
.entity( ParentEntity.class )
.getList( "singleTableEntities", SingleTableEntity.class ),
JoinType.LEFT
);
final ListJoin<ParentEntity, SingleTableSubEntity> treatedJoin = cb.treat(
listJoin,
SingleTableSubEntity.class
);
final Path<?> childPath = treatedJoin.get( "child" );
cq.select( root ).where( cb.or(
cb.equal( childPath, childEntity ),
childPath.isNull()
) ).orderBy( cb.asc( root.get( "id" ) ) );
final TypedQuery<ParentEntity> query = session.createQuery( cq );
final List<ParentEntity> resultList = query.getResultList();
assertThat( resultList ).hasSize( 2 );
assertThat( resultList.get( 0 ).getSingleTableEntities() ).isEmpty();
assertThat( resultList.get( 1 ).getSingleTableEntities() ).hasSize( 1 );
final SingleTableEntity subEntity = resultList.get( 1 ).getSingleTableEntities().get( 0 );
assertThat( subEntity ).isInstanceOf( SingleTableSubEntity.class );
assertThat( ( (SingleTableSubEntity) subEntity ).getChild().getId() ).isEqualTo( 1L );
} );
}
@Test
public void testJoined(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final ChildEntity childEntity = session.find( ChildEntity.class, 1L );
final CriteriaBuilder cb = session.getCriteriaBuilder();
final CriteriaQuery<ParentEntity> cq = cb.createQuery( ParentEntity.class );
final Root<ParentEntity> root = cq.from( ParentEntity.class );
final SetJoin<ParentEntity, JoinedEntity> join = root.join(
session.getMetamodel().entity( ParentEntity.class ).getSet( "joinedEntities", JoinedEntity.class ),
JoinType.LEFT
);
final SetJoin<ParentEntity, JoinedSubEntity> treatedJoin = cb.treat(
join,
JoinedSubEntity.class
);
final Path<?> childPath = treatedJoin.get( "child" );
cq.select( root ).where( cb.or(
cb.equal( childPath, childEntity ),
childPath.isNull()
) ).orderBy( cb.asc( root.get( "id" ) ) );
final TypedQuery<ParentEntity> query = session.createQuery( cq );
final List<ParentEntity> resultList = query.getResultList();
assertThat( resultList ).hasSize( 2 );
assertThat( resultList.get( 0 ).getJoinedEntities() ).isEmpty();
assertThat( resultList.get( 1 ).getJoinedEntities() ).hasSize( 1 );
final JoinedEntity subEntity = resultList.get( 1 ).getJoinedEntities().iterator().next();
assertThat( subEntity ).isInstanceOf( JoinedSubEntity.class );
assertThat( ( (JoinedSubEntity) subEntity ).getChild().getId() ).isEqualTo( 1L );
} );
}
@Test
public void testTablePerClass(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final ChildEntity childEntity = session.find( ChildEntity.class, 1L );
final CriteriaBuilder cb = session.getCriteriaBuilder();
final CriteriaQuery<ParentEntity> cq = cb.createQuery( ParentEntity.class );
final Root<ParentEntity> root = cq.from( ParentEntity.class );
final CollectionJoin<ParentEntity, TablePerClassEntity> join = root.join(
session.getMetamodel()
.entity( ParentEntity.class )
.getCollection( "tablePerClassEntities", TablePerClassEntity.class ),
JoinType.LEFT
);
final CollectionJoin<ParentEntity, TablePerClassSubEntity> treatedJoin = cb.treat(
join,
TablePerClassSubEntity.class
);
final Path<?> childPath = treatedJoin.get( "child" );
cq.select( root ).where( cb.or(
cb.equal( childPath, childEntity ),
childPath.isNull()
) ).orderBy( cb.asc( root.get( "id" ) ) );
final TypedQuery<ParentEntity> query = session.createQuery( cq );
final List<ParentEntity> resultList = query.getResultList();
assertThat( resultList ).hasSize( 2 );
assertThat( resultList.get( 0 ).getTablePerClassEntities() ).isEmpty();
assertThat( resultList.get( 1 ).getTablePerClassEntities() ).hasSize( 1 );
final TablePerClassEntity subEntity = resultList.get( 1 ).getTablePerClassEntities().iterator().next();
assertThat( subEntity ).isInstanceOf( TablePerClassSubEntity.class );
assertThat( ( (TablePerClassSubEntity) subEntity ).getChild().getId() ).isEqualTo( 1L );
} );
}
@Entity( name = "ParentEntity" )
public static class ParentEntity {
@Id
private Long id;
private String name;
@OneToMany( mappedBy = "parentEntity" )
private List<SingleTableEntity> singleTableEntities;
@OneToMany( mappedBy = "parentEntity" )
private Set<JoinedEntity> joinedEntities;
@OneToMany( mappedBy = "parentEntity" )
private Collection<TablePerClassEntity> tablePerClassEntities;
public ParentEntity() {
}
public ParentEntity(
Long id,
String name,
List<SingleTableEntity> singleTableEntities,
Set<JoinedEntity> joinedEntities,
Collection<TablePerClassEntity> tablePerClassEntities) {
this.id = id;
this.name = name;
this.singleTableEntities = singleTableEntities;
this.joinedEntities = joinedEntities;
this.tablePerClassEntities = tablePerClassEntities;
}
public List<SingleTableEntity> getSingleTableEntities() {
return singleTableEntities;
}
public Set<JoinedEntity> getJoinedEntities() {
return joinedEntities;
}
public Collection<TablePerClassEntity> getTablePerClassEntities() {
return tablePerClassEntities;
}
}
@Entity( name = "SingleTableEntity" )
@Inheritance( strategy = InheritanceType.SINGLE_TABLE )
@DiscriminatorColumn( name = "disc_col" )
public static class SingleTableEntity {
@Id
@GeneratedValue
private Long id;
@ManyToOne
private ParentEntity parentEntity;
public ParentEntity getParentEntity() {
return parentEntity;
}
public void setParentEntity(ParentEntity parentEntity) {
this.parentEntity = parentEntity;
}
}
@Entity( name = "SingleTableSubEntity" )
public static class SingleTableSubEntity extends SingleTableEntity {
@ManyToOne
private ChildEntity child;
public SingleTableSubEntity() {
}
public SingleTableSubEntity(ChildEntity child) {
this.child = child;
}
public ChildEntity getChild() {
return child;
}
}
@Entity( name = "JoinedEntity" )
@Inheritance( strategy = InheritanceType.JOINED )
public static class JoinedEntity {
@Id
@GeneratedValue
private Long id;
@ManyToOne
private ParentEntity parentEntity;
public ParentEntity getParentEntity() {
return parentEntity;
}
public void setParentEntity(ParentEntity parentEntity) {
this.parentEntity = parentEntity;
}
}
@Entity( name = "JoinedSubEntity" )
public static class JoinedSubEntity extends JoinedEntity {
@ManyToOne
private ChildEntity child;
public JoinedSubEntity() {
}
public JoinedSubEntity(ChildEntity child) {
this.child = child;
}
public ChildEntity getChild() {
return child;
}
}
@Entity( name = "TablePerClassEntity" )
@Inheritance( strategy = InheritanceType.TABLE_PER_CLASS )
public static class TablePerClassEntity {
@Id
@GeneratedValue
private Long id;
@ManyToOne
private ParentEntity parentEntity;
public ParentEntity getParentEntity() {
return parentEntity;
}
public void setParentEntity(ParentEntity parentEntity) {
this.parentEntity = parentEntity;
}
}
@Entity( name = "TablePerClassSubEntity" )
public static class TablePerClassSubEntity extends TablePerClassEntity {
@ManyToOne
private ChildEntity child;
public TablePerClassSubEntity() {
}
public TablePerClassSubEntity(ChildEntity child) {
this.child = child;
}
public ChildEntity getChild() {
return child;
}
}
@Entity( name = "ChildEntity" )
public static class ChildEntity {
@Id
private Long id;
public ChildEntity() {
}
public ChildEntity(Long id) {
this.id = id;
}
public Long getId() {
return id;
}
}
}