HHH-15523 Make use of SqlStringGenerationContext in MapBinder#getFromAndWhereFormula

Author: beikov

hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapBinder.java

@@ -26,11 +26,14 @@
 import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.boot.model.relational.SqlStringGenerationContext;
+import org.hibernate.boot.model.relational.internal.SqlStringGenerationContextImpl;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.cfg.AccessType;
 import org.hibernate.cfg.AnnotatedClassType;
 import org.hibernate.cfg.AnnotationBinder;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.BinderHelper;
 import org.hibernate.cfg.CollectionPropertyHolder;
 import org.hibernate.cfg.CollectionSecondPass;
@@ -42,6 +45,8 @@
 import org.hibernate.cfg.PropertyPreloadedData;
 import org.hibernate.cfg.SecondPass;
 import org.hibernate.dialect.HSQLDialect;
+import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Column;
@@ -57,6 +62,7 @@
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
+import org.hibernate.service.ServiceRegistry;
 import org.hibernate.sql.Template;
 
 /**
@@ -412,6 +418,14 @@ protected Value createFormulatedValue(
 			MetadataBuildingContext buildingContext) {
 		Value element = collection.getElement();
 		String fromAndWhere = null;
+		final ServiceRegistry serviceRegistry = buildingContext.getBootstrapContext().getServiceRegistry();
+		final ConfigurationService configurationService = serviceRegistry.getService( ConfigurationService.class);
+		final SqlStringGenerationContext generationContext = SqlStringGenerationContextImpl.fromExplicit(
+				serviceRegistry.getService( JdbcServices.class).getJdbcEnvironment(),
+				buildingContext.getMetadataCollector().getDatabase(),
+				configurationService.getSetting(AvailableSettings.DEFAULT_CATALOG, String.class, null),
+				configurationService.getSetting( AvailableSettings.DEFAULT_SCHEMA, String.class, null)
+		);
 		if ( !( element instanceof OneToMany ) ) {
 			String referencedPropertyName = null;
 			if ( element instanceof ToOne ) {
@@ -435,7 +449,7 @@ else if ( element instanceof DependantValue ) {
 				referencedEntityColumns = referencedProperty.getColumnIterator();
 			}
 			fromAndWhere = getFromAndWhereFormula(
-					associatedClass.getTable().getQualifiedTableName().toString(),
+					generationContext.format(associatedClass.getTable().getQualifiedTableName()),
 					element.getColumnIterator(),
 					referencedEntityColumns
 			);
@@ -444,9 +458,7 @@ else if ( element instanceof DependantValue ) {
 			// HHH-11005 - only if we are OneToMany and location of map key property is at a different level, need to add a select
 			if ( !associatedClass.equals( targetPropertyPersistentClass ) ) {
 				fromAndWhere = getFromAndWhereFormula(
-						targetPropertyPersistentClass.getTable()
-								.getQualifiedTableName()
-								.toString(),
+						generationContext.format(targetPropertyPersistentClass.getTable().getQualifiedTableName()),
 						element.getColumnIterator(),
 						associatedClass.getIdentifier().getColumnIterator()
 				);

hibernate-core/src/test/java/org/hibernate/test/jpa/ql/MapKeySubquerySchemaTest.java

@@ -32,9 +32,10 @@ public class MapKeySubquerySchemaTest extends BaseCoreFunctionalTestCase {
 	public void testMapKeyLoad() {
 		final QueryableCollection collectionPersister = (QueryableCollection) sessionFactory().getMetamodel()
 				.collectionPersister( MapOwner.class.getName() + ".contents" );
-		Assert.assertEquals(
-				"(select a1.relationship_id from " + CUSTOM_SCHEMA + ".MapContent a1 where a1.id=contents_id)",
-				collectionPersister.getIndexFormulas()[0]
+		Assert.assertTrue(
+				"Index SQL does not contain the schema name",
+				collectionPersister.getIndexFormulas()[0].contains( CUSTOM_SCHEMA + ".MapContent " )
+
 		);
 	}