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

HHH-18288 @Index specified by subclass in SINGLE_TABLE inheritance 

I'm definitely not a fan of @Table annotations on subclasses in SINGLE_TABLE
hierarchies. However, unfortunately we've already decided to tolerate it.

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-06-21 10:12:35 +02:00
parent fe89a94b8a
commit f947927234
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java
View File

@ -750,8 +750,7 @@ public class EntityBinder {
final String table; final String table;
final String catalog; final String catalog;
final UniqueConstraint[] uniqueConstraints; final UniqueConstraint[] uniqueConstraints;
boolean hasTableAnnotation = annotatedClass.isAnnotationPresent( jakarta.persistence.Table.class ); if ( annotatedClass.isAnnotationPresent( jakarta.persistence.Table.class ) ) {
if ( hasTableAnnotation ) {
final jakarta.persistence.Table tableAnnotation = annotatedClass.getAnnotation( jakarta.persistence.Table.class ); final jakarta.persistence.Table tableAnnotation = annotatedClass.getAnnotation( jakarta.persistence.Table.class );
table = tableAnnotation.name(); table = tableAnnotation.name();
schema = tableAnnotation.schema(); schema = tableAnnotation.schema();
@ -771,7 +770,7 @@ public class EntityBinder {
} }
else { else {
// must be a SINGLE_TABLE mapping for a subclass // must be a SINGLE_TABLE mapping for a subclass
if ( hasTableAnnotation ) { if ( !table.isEmpty() ) {
final Table superTable = persistentClass.getRootClass().getTable(); final Table superTable = persistentClass.getRootClass().getTable();
if ( !logicalTableName( table, schema, catalog ) if ( !logicalTableName( table, schema, catalog )
.equals( superTable.getQualifiedTableName() ) ) { .equals( superTable.getQualifiedTableName() ) ) {

42
hibernate-core/src/test/java/org/hibernate/orm/test/schema/SubclassIndexTest.java Normal file
View File

@ -0,0 +1,42 @@
package org.hibernate.orm.test.schema;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OrderColumn;
import jakarta.persistence.Table;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.Test;
import java.util.List;
@JiraKey("HHH-18288")
@SessionFactory
@DomainModel(annotatedClasses = {SubclassIndexTest.Foo.class, SubclassIndexTest.Bar.class})
public class SubclassIndexTest {
@Test void test(SessionFactoryScope scope) {
scope.getSessionFactory();
}
@Entity
@Table(name = "FOO")
static class Foo {
@Id
long id;
}
@Entity
@Table(indexes = @Index(name="IDX", columnList = "text"))
static class Bar extends Foo {
@OneToMany
@OrderColumn
List<Foo> foo;
String text;
}
}