[hibernate-commits] Hibernate SVN: r17257 - core/trunk/core/src/main/java/org/hibernate/cfg.
Author: epbernard
Date: 2009-08-10 11:13:12 -0400 (Mon, 10 Aug 2009)
New Revision: 17257
Modified:
core/trunk/core/src/main/java/org/hibernate/cfg/HbmBinder.java
Log:
HHH-4077 improper use of logicalColumnName
Modified: core/trunk/core/src/main/java/org/hibernate/cfg/HbmBinder.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/cfg/HbmBinder.java 2009-08-10 06:40:43 UTC
(rev 17256)
+++ core/trunk/core/src/main/java/org/hibernate/cfg/HbmBinder.java 2009-08-10 15:13:12 UTC
(rev 17257)
@@ -1074,11 +1074,12 @@
column.setValue( simpleValue );
column.setTypeIndex( count++ );
bindColumn( columnElement, column, isNullable );
+ final String columnName = columnElement.attributeValue( "name" );
String logicalColumnName = mappings.getNamingStrategy().logicalColumnName(
- columnElement.attributeValue( "name" ), propertyPath
+ columnName, propertyPath
);
column.setName( mappings.getNamingStrategy().columnName(
- logicalColumnName ) );
+ columnName ) );
if ( table != null ) {
table.addColumn( column ); // table=null -> an association
// - fill it in later
@@ -1115,10 +1116,11 @@
Column column = new Column();
column.setValue( simpleValue );
bindColumn( node, column, isNullable );
+ final String columnName = columnAttribute.getValue();
String logicalColumnName = mappings.getNamingStrategy().logicalColumnName(
- columnAttribute.getValue(), propertyPath
+ columnName, propertyPath
);
- column.setName( mappings.getNamingStrategy().columnName( logicalColumnName ) );
+ column.setName( mappings.getNamingStrategy().columnName( columnName ) );
if ( table != null ) {
table.addColumn( column ); // table=null -> an association - fill
// it in later