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

Cleanup docs, implement appendHqlString for DiscriminatorSqmPath and fix MapMember type

This commit is contained in:
Christian Beikov 2021-09-01 18:02:42 +02:00
parent 76bfbccbe6
commit c16731d14a
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
documentation/src/main/asciidoc/userguide/chapters/domain/extras/embeddable/embeddable-type-override-mapping-example.sql
View File

@ -1,20 +1,20 @@
create table Book ( create table Book (
id bigint not null, id bigint not null,
author varchar(255), author varchar(255),
ebook_publisher_name varchar(255), ebook_pub_name varchar(255),
paper_back_publisher_name varchar(255), paper_back_pub_name varchar(255),
title varchar(255), title varchar(255),
ebook_publisher_country_id bigint, ebook_pub_country_id bigint,
paper_back_publisher_country_id bigint, paper_back_pub_country_id bigint,
primary key (id) primary key (id)
) )
alter table Book alter table Book
add constraint FKm39ibh5jstybnslaoojkbac2g add constraint FKm39ibh5jstybnslaoojkbac2g
foreign key (ebook_publisher_country_id) foreign key (ebook_pub_country_id)
references Country references Country
alter table Book alter table Book
add constraint FK7kqy9da323p7jw7wvqgs6aek7 add constraint FK7kqy9da323p7jw7wvqgs6aek7
foreign key (paper_back_publisher_country_id) foreign key (paper_back_pub_country_id)
references Country references Country

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
View File

@ -589,7 +589,10 @@ public class AttributeFactory {
final EmbeddableDomainType<?> ownerType = (EmbeddableDomainType) attributeContext.getOwnerType(); final EmbeddableDomainType<?> ownerType = (EmbeddableDomainType) attributeContext.getOwnerType();
if ( ownerType.getRepresentationStrategy().getMode() == RepresentationMode.MAP ) { if ( ownerType.getRepresentationStrategy().getMode() == RepresentationMode.MAP ) {
return new MapMember( attributeContext.getPropertyMapping().getName(), ownerType.getExpressableJavaTypeDescriptor().getJavaTypeClass() ); return new MapMember(
attributeContext.getPropertyMapping().getName(),
attributeContext.getPropertyMapping().getType().getReturnedClass()
);
} }
else { else {
return ownerType.getRepresentationStrategy() return ownerType.getRepresentationStrategy()

4
hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DiscriminatorSqmPath.java
View File

@ -72,7 +72,9 @@ public class DiscriminatorSqmPath extends AbstractSqmPath implements SelfInterpr
@Override @Override
public void appendHqlString(StringBuilder sb) { public void appendHqlString(StringBuilder sb) {
// todo (6.0) : no idea sb.append( "type(" );
getLhs().appendHqlString( sb );
sb.append( ')' );
} }
@Override @Override