From 3f60619f3fde22d949283e051a5f1b9cb1ebf073 Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Thu, 11 May 2017 21:07:38 -0500
Subject: [PATCH] HHH-11739 - Fix tests

---
 .../quote/ColumnDefinitionQuotingTest.java    | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/hibernate-core/src/test/java/org/hibernate/test/quote/ColumnDefinitionQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/test/quote/ColumnDefinitionQuotingTest.java
index 99c982a9e9..43e9c78d50 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/quote/ColumnDefinitionQuotingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/quote/ColumnDefinitionQuotingTest.java
@@ -58,6 +58,32 @@ public void doTestWork(StandardServiceRegistry ssr) {
 		);
 	}
 
+	@Test
+	@TestForIssue( jiraKey = "HHH-9491" )
+	public void testExplicitQuotingSkippingColumnDef() {
+		withStandardServiceRegistry(
+				false,
+				true,
+				new TestWork() {
+					@Override
+					public void doTestWork(StandardServiceRegistry ssr) {
+						MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+								.addAnnotatedClass( E1.class )
+								.buildMetadata();
+						metadata.validate();
+
+						PersistentClass entityBinding = metadata.getEntityBinding( E1.class.getName() );
+
+						org.hibernate.mapping.Column idColumn = extractColumn( entityBinding.getIdentifier().getColumnIterator() );
+						assertTrue( isQuoted( idColumn.getSqlType(), ssr ) );
+
+						org.hibernate.mapping.Column otherColumn = extractColumn( entityBinding.getProperty( "other" ).getColumnIterator() );
+						assertTrue( isQuoted( otherColumn.getSqlType(), ssr ) );
+					}
+				}
+		);
+	}
+
 	private org.hibernate.mapping.Column extractColumn(Iterator columnIterator) {
 		return (org.hibernate.mapping.Column) columnIterator.next();
 	}
@@ -70,10 +96,10 @@ private boolean isQuoted(String sqlType, StandardServiceRegistry ssr) {
 
 	@Test
 	@TestForIssue( jiraKey = "HHH-9491" )
-	public void testGlobalQuotingOptIn() {
+	public void testGlobalQuotingNotSkippingColumnDef() {
 		withStandardServiceRegistry(
 				true,
-				true,
+				false,
 				new TestWork() {
 					@Override
 					public void doTestWork(StandardServiceRegistry ssr) {
@@ -96,10 +122,10 @@ public void doTestWork(StandardServiceRegistry ssr) {
 
 	@Test
 	@TestForIssue( jiraKey = "HHH-9491" )
-	public void testGlobalQuotingOptOut() {
+	public void testGlobalQuotingSkippingColumnDef() {
 		withStandardServiceRegistry(
 				true,
-				false,
+				true,
 				new TestWork() {
 					@Override
 					public void doTestWork(StandardServiceRegistry ssr) {