Revert "HHH-9805 - Backport for 4.2 branch"

This reverts commit 938064fc3de38757bc93d06d71420e518e406c7c.
This commit is contained in:
Gail Badner 2015-06-16 17:30:56 -07:00
parent fd9c92eaf6
commit 20987c9d9c

View File

@ -37,7 +37,6 @@
import org.hibernate.annotations.JoinColumnsOrFormulas;
import org.hibernate.annotations.JoinFormula;
import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.cfg.naming.NamingStrategyDelegate;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Join;
@ -658,17 +657,12 @@ public void redefineColumnName(String columnName, String propertyName, boolean a
if ( StringHelper.isNotEmpty( columnName ) ) {
getMappingColumn().setName(
applyNamingStrategy ?
quoteIdentifier( getNamingStrategyDelegate().toPhysicalColumnName( columnName ) ) :
getNamingStrategyDelegate().toPhysicalColumnName( columnName ) :
columnName
);
}
}
private String quoteIdentifier(String identifier) {
return getMappings().getObjectNameNormalizer().isUseQuotedIdentifiersGlobally()
? StringHelper.quote( identifier ) : identifier;
}
public static Ejb3JoinColumn[] buildJoinTableJoinColumns(
JoinColumn[] annJoins,
Map<String, Join> secondaryTables,