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

HHH-11502 - Fix NPE.

This commit is contained in:
Chris Cranford 2017-02-27 09:56:18 -05:00
parent 8d726a35b1
commit e77d18c0d1
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
View File

@ -4116,7 +4116,7 @@ public class ModelBinder {
// implicit naming. If we get here, we assume that there is only a single
// column making up the FK
final String referencedEntityAttributeName = manyToOneSource.getReferencedEntityAttributeName();
// final String referencedEntityAttributeName = manyToOneSource.getReferencedEntityAttributeName();
final PersistentClass referencedEntityBinding = mappingDocument.getMetadataCollector()
.getEntityBinding( referencedEntityName );
@ -4128,35 +4128,35 @@ public class ModelBinder {
);
}
final EntityNaming entityNaming = new EntityNamingSourceImpl( referencedEntityBinding );
final Identifier referencedTableName;
final Identifier referencedColumnName;
if ( referencedEntityAttributeName == null ) {
referencedTableName = referencedEntityBinding.getTable().getNameIdentifier();
final Column referencedColumn = referencedEntityBinding.getTable()
.getPrimaryKey()
.getColumn( 0 );
referencedColumnName = mappingDocument.getMetadataCollector()
.getDatabase()
.getJdbcEnvironment()
.getIdentifierHelper()
.toIdentifier( referencedColumn.getQuotedName() );
}
else {
final Property referencedProperty = referencedEntityBinding.getReferencedProperty(
referencedEntityAttributeName
);
final SimpleValue value = (SimpleValue) referencedProperty.getValue();
referencedTableName = value.getTable().getNameIdentifier();
final Column referencedColumn = (Column) value.getColumnIterator().next();
referencedColumnName = mappingDocument.getMetadataCollector()
.getDatabase()
.getJdbcEnvironment()
.getIdentifierHelper()
.toIdentifier( referencedColumn.getQuotedName() );
}
// final EntityNaming entityNaming = new EntityNamingSourceImpl( referencedEntityBinding );
//
// final Identifier referencedTableName;
// final Identifier referencedColumnName;
//
// if ( referencedEntityAttributeName == null ) {
// referencedTableName = referencedEntityBinding.getTable().getNameIdentifier();
// final Column referencedColumn = referencedEntityBinding.getTable()
// .getPrimaryKey()
// .getColumn( 0 );
// referencedColumnName = mappingDocument.getMetadataCollector()
// .getDatabase()
// .getJdbcEnvironment()
// .getIdentifierHelper()
// .toIdentifier( referencedColumn.getQuotedName() );
// }
// else {
// final Property referencedProperty = referencedEntityBinding.getReferencedProperty(
// referencedEntityAttributeName
// );
// final SimpleValue value = (SimpleValue) referencedProperty.getValue();
// referencedTableName = value.getTable().getNameIdentifier();
// final Column referencedColumn = (Column) value.getColumnIterator().next();
// referencedColumnName = mappingDocument.getMetadataCollector()
// .getDatabase()
// .getJdbcEnvironment()
// .getIdentifierHelper()
// .toIdentifier( referencedColumn.getQuotedName() );
// }
relationalObjectBinder.bindColumnsAndFormulas(
mappingDocument,