Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Joined inheritance work - implemented explicit Discriminator

This commit is contained in:
Andrea Boriero 2019-11-11 13:35:35 +00:00
parent 895cc3f529
commit 186f4b37c0
5 changed files with 245 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
View File

@ -1235,15 +1235,20 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
}
public EntityDiscriminatorMapping getDiscriminatorMapping(TableGroup tableGroup) {
CaseSearchedExpressionInfo info = getCaseSearchedExpression( tableGroup );
return new JoinedSubclassDiscriminatorMappingImpl(
this,
getRootTableName(),
getDiscriminatorColumnName(),
info.caseSearchedExpression,
info.columnReferences,
(BasicType) getDiscriminatorType()
);
if ( explicitDiscriminatorColumnName == null ) {
CaseSearchedExpressionInfo info = getCaseSearchedExpression( tableGroup );
return new JoinedSubclassDiscriminatorMappingImpl(
this,
getRootTableName(),
getDiscriminatorColumnName(),
info.caseSearchedExpression,
info.columnReferences,
(BasicType) getDiscriminatorType()
);
}
else {
return getDiscriminatorMapping();
}
}
private class CaseSearchedExpressionInfo{

5
hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java
View File

@ -23,8 +23,6 @@ import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
@ -46,9 +44,6 @@ import static org.junit.Assert.assertTrue;
)
@ServiceRegistry
@SessionFactory
@Tags({
@Tag("RunnableIdeTest"),
})
public class JoinedInheritanceWithConcreteRootTest {
@Test
public void basicTest(SessionFactoryScope scope) {

230
hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java Normal file
View File

@ -0,0 +1,230 @@
/*
* 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.metamodel.mapping.inheritance.joined;
import java.sql.Statement;
import java.util.List;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.ServiceRegistry;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
/**
* @author Andrea Boriero
*/
@DomainModel(
annotatedClasses = {
JoinedInheritanceWithExplicitDiscriminatorTest.Customer.class,
JoinedInheritanceWithExplicitDiscriminatorTest.DomesticCustomer.class,
JoinedInheritanceWithExplicitDiscriminatorTest.ForeignCustomer.class
}
)
@ServiceRegistry
@SessionFactory
public class JoinedInheritanceWithExplicitDiscriminatorTest {
@Test
public void rootQueryExecutionTest(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
{
// [name, taxId, vat]
final List<Customer> results = session.createQuery(
"select c from Customer c",
Customer.class
).list();
assertThat( results.size(), is( 2 ) );
boolean foundDomesticCustomer = false;
boolean foundForeignCustomer = false;
for ( Customer result : results ) {
if ( result.getId() == 1 ) {
assertThat( result, instanceOf( DomesticCustomer.class ) );
final DomesticCustomer customer = (DomesticCustomer) result;
assertThat( customer.getName(), is( "domestic" ) );
assertThat( ( customer ).getTaxId(), is( "123" ) );
foundDomesticCustomer = true;
}
else {
assertThat( result.getId(), is( 2 ) );
final ForeignCustomer customer = (ForeignCustomer) result;
assertThat( customer.getName(), is( "foreign" ) );
assertThat( ( customer ).getVat(), is( "987" ) );
foundForeignCustomer = true;
}
}
assertTrue( foundDomesticCustomer );
assertTrue( foundForeignCustomer );
}
}
);
}
@Test
public void subclassQueryExecutionTest(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
{
final DomesticCustomer result = session.createQuery(
"select c from DomesticCustomer c",
DomesticCustomer.class
).uniqueResult();
assertThat( result, notNullValue() );
assertThat( result.getId(), is( 1 ) );
assertThat( result.getName(), is( "domestic" ) );
assertThat( result.getTaxId(), is( "123" ) );
}
{
final ForeignCustomer result = session.createQuery(
"select c from ForeignCustomer c",
ForeignCustomer.class
).uniqueResult();
assertThat( result, notNullValue() );
assertThat( result.getId(), is( 2 ) );
assertThat( result.getName(), is( "foreign" ) );
assertThat( result.getVat(), is( "987" ) );
}
}
);
}
@BeforeEach
public void createTestData(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
session.persist( new DomesticCustomer( 1, "domestic", "123" ) );
session.persist( new ForeignCustomer( 2, "foreign", "987" ) );
}
);
}
@AfterEach
public void cleanupTestData(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
session.doWork(
work -> {
Statement statement = work.createStatement();
try {
statement.execute( "delete from DomesticCustomer" );
statement.execute( "delete from ForeignCustomer" );
statement.execute( "delete from Customer" );
}
finally {
statement.close();
}
}
);
// session.createQuery( "from DomesticCustomer", DomesticCustomer.class ).list().forEach(
// cust -> session.delete( cust )
// );
// session.createQuery( "from ForeignCustomer", ForeignCustomer.class ).list().forEach(
// cust -> session.delete( cust )
// );
}
);
}
@Entity(name = "Customer")
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "Customer")
@DiscriminatorColumn(name = "cust_disc")
public static abstract class Customer {
private Integer id;
private String name;
public Customer() {
}
public Customer(Integer id, String name) {
this.id = id;
this.name = name;
}
@Id
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
@Entity(name = "DomesticCustomer")
@Table(name = "DomesticCustomer")
@DiscriminatorValue( "dc" )
public static class DomesticCustomer extends Customer {
private String taxId;
public DomesticCustomer() {
}
public DomesticCustomer(Integer id, String name, String taxId) {
super( id, name );
this.taxId = taxId;
}
public String getTaxId() {
return taxId;
}
public void setTaxId(String taxId) {
this.taxId = taxId;
}
}
@Entity(name = "ForeignCustomer")
@Table(name = "ForeignCustomer")
@DiscriminatorValue( "fc" )
public static class ForeignCustomer extends Customer {
private String vat;
public ForeignCustomer() {
}
public ForeignCustomer(Integer id, String name, String vat) {
super( id, name );
this.vat = vat;
}
public String getVat() {
return vat;
}
public void setVat(String vat) {
this.vat = vat;
}
}
}

5
hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/mapping/inheritance/joined/MixedInheritanceTest.java
View File

@ -25,8 +25,6 @@ import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
@ -49,9 +47,6 @@ import static org.junit.Assert.assertTrue;
)
@ServiceRegistry
@SessionFactory
@Tags({
@Tag("RunnableIdeTest"),
})
public class MixedInheritanceTest {
@Test
public void basicTest(SessionFactoryScope scope) {

1
hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/mapping/inheritance/tableperclass/MixedInheritanceTest.java
View File

@ -280,4 +280,5 @@ public class MixedInheritanceTest {
this.vat = vat;
}
}
}