From 06c08d99496fa4bc94e563288f47bf93003a52e1 Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Mon, 25 May 2015 18:17:54 +0100
Subject: [PATCH] HHH-9805 - Column name specified in @JoinColumn is not quoted
 with option hibernate.globally_quoted_identifiers=true

---
 .../src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java
index 19587ba0f4..56afd6aaa9 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java
@@ -37,6 +37,7 @@ import org.hibernate.annotations.JoinColumnOrFormula;
 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;
@@ -657,12 +658,17 @@ public class Ejb3JoinColumn extends Ejb3Column {
 		if ( StringHelper.isNotEmpty( columnName ) ) {
 			getMappingColumn().setName(
 					applyNamingStrategy ?
-							getNamingStrategyDelegate().toPhysicalColumnName( columnName ) :
+							quoteIdentifier( 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,