HHH-19388 Process <database-object> in mapping.xml

dreab8 · dreab8 · commit d04783fec5e0 · 2025-09-23T17:14:26.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java
@@ -25,6 +25,7 @@
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
 import org.hibernate.boot.model.NamedEntityGraphDefinition;
 import org.hibernate.boot.model.convert.spi.RegisteredConversion;
+import org.hibernate.boot.model.source.internal.hbm.AuxiliaryDatabaseObjectBinder;
 import org.hibernate.boot.models.HibernateAnnotations;
 import org.hibernate.boot.models.JpaAnnotations;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
@@ -117,6 +118,10 @@ public static void bindDefaults(MetadataBuildingContext context) {
 			QueryBinder.bindNamedStoredProcedureQuery( queryRegistration.configuration(), context, true );
 		} );
 
+		globalRegistrations.getDatabaseObjectRegistrations().forEach( databaseObjectRegistration ->
+				AuxiliaryDatabaseObjectBinder.processAuxiliaryDatabaseObject( context, databaseObjectRegistration )
+		);
+
 	}
 
 	private static ModelsContext modelsContext(MetadataBuildingContext context) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AuxiliaryDatabaseObjectBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AuxiliaryDatabaseObjectBinder.java
@@ -4,11 +4,16 @@
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
+import org.hibernate.MappingException;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmAuxiliaryDatabaseObjectType;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmDialectScopeType;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.model.relational.SimpleAuxiliaryDatabaseObject;
+import org.hibernate.boot.models.spi.DatabaseObjectRegistration;
+import org.hibernate.boot.models.spi.DialectScopeRegistration;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.internal.util.StringHelper;
 
 /**
  * @author Steve Ebersole
@@ -68,4 +73,51 @@ public static void processAuxiliaryDatabaseObject(
 
 		context.getMetadataCollector().getDatabase().addAuxiliaryDatabaseObject( auxDbObject );
 	}
+
+	public static void processAuxiliaryDatabaseObject(
+			MetadataBuildingContext context,
+			DatabaseObjectRegistration databaseObjectRegistration) {
+		final AuxiliaryDatabaseObject auxDbObject;
+
+		if ( StringHelper.isNotEmpty( databaseObjectRegistration.definition()) ) {
+			try {
+				auxDbObject = (AuxiliaryDatabaseObject)
+						context.getBootstrapContext().getClassLoaderService()
+								.classForName( databaseObjectRegistration.definition() )
+								.newInstance();
+			}
+			catch (ClassLoadingException cle) {
+				throw cle;
+			}
+			catch (Exception e) {
+				throw new MappingException(
+						String.format(
+								"Unable to instantiate custom AuxiliaryDatabaseObject class [%s]",
+								databaseObjectRegistration.definition()
+						)
+				);
+			}
+		}
+		else {
+			auxDbObject = new SimpleAuxiliaryDatabaseObject(
+					context.getMetadataCollector().getDatabase().getDefaultNamespace(),
+					databaseObjectRegistration.create(),
+					databaseObjectRegistration.drop(),
+					null
+			);
+		}
+
+		if ( !databaseObjectRegistration.dialectScopes().isEmpty() ) {
+			if ( auxDbObject instanceof AuxiliaryDatabaseObject.Expandable expandable ) {
+				for ( DialectScopeRegistration dialectScopeRegistration : databaseObjectRegistration.dialectScopes() ) {
+					expandable.addDialectScope( dialectScopeRegistration.name());
+				}
+			}
+			else {
+				// error?  warn?
+			}
+		}
+
+		context.getMetadataCollector().getDatabase().addAuxiliaryDatabaseObject( auxDbObject );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java
@@ -85,6 +85,7 @@ public void apply(JaxbEntityMappingsImpl jaxbRoot, XmlDocumentContext xmlDocumen
 
 		getGlobalRegistrations().collectQueryReferences( jaxbRoot, xmlDocumentContext );
 
+		getGlobalRegistrations().collectDataBaseObject( jaxbRoot.getDatabaseObjects() );
 		// todo (7.0) : named graphs?
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java
@@ -24,6 +24,8 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbConfigurationParameterImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbConverterImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbConverterRegistrationImpl;
+import org.hibernate.boot.jaxb.mapping.spi.JaxbDatabaseObjectImpl;
+import org.hibernate.boot.jaxb.mapping.spi.JaxbDatabaseObjectScopeImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEmbeddableInstantiatorRegistrationImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityListenerImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
@@ -53,6 +55,8 @@
 import org.hibernate.boot.models.spi.CompositeUserTypeRegistration;
 import org.hibernate.boot.models.spi.ConversionRegistration;
 import org.hibernate.boot.models.spi.ConverterRegistration;
+import org.hibernate.boot.models.spi.DatabaseObjectRegistration;
+import org.hibernate.boot.models.spi.DialectScopeRegistration;
 import org.hibernate.boot.models.spi.EmbeddableInstantiatorRegistration;
 import org.hibernate.boot.models.spi.FilterDefRegistration;
 import org.hibernate.boot.models.spi.GenericGeneratorRegistration;
@@ -144,6 +148,8 @@ public class GlobalRegistrationsImpl implements GlobalRegistrations, GlobalRegis
 	private Map<String, NamedNativeQueryRegistration> namedNativeQueryRegistrations;
 	private Map<String, NamedStoredProcedureQueryRegistration> namedStoredProcedureQueryRegistrations;
 
+	private List<DatabaseObjectRegistration> databaseObjectRegistrations;
+
 	public GlobalRegistrationsImpl(ModelsContext sourceModelContext, BootstrapContext bootstrapContext) {
 		this.sourceModelContext = sourceModelContext;
 		this.bootstrapContext = bootstrapContext;
@@ -242,9 +248,13 @@ public Map<String, NamedNativeQueryRegistration> getNamedNativeQueryRegistration
 
 	@Override
 	public Map<String, NamedStoredProcedureQueryRegistration> getNamedStoredProcedureQueryRegistrations() {
-		return namedStoredProcedureQueryRegistrations== null ? emptyMap() : namedStoredProcedureQueryRegistrations;
+		return namedStoredProcedureQueryRegistrations == null ? emptyMap() : namedStoredProcedureQueryRegistrations;
 	}
 
+	@Override
+	public List<DatabaseObjectRegistration> getDatabaseObjectRegistrations() {
+		return databaseObjectRegistrations == null ? emptyList() : databaseObjectRegistrations;
+	}
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// JavaTypeRegistration
@@ -1314,4 +1324,34 @@ private List<QueryHint> extractQueryHints(JaxbQueryHintContainer jaxbQuery) {
 		}
 		return hints;
 	}
+
+	public void collectDataBaseObject(List<JaxbDatabaseObjectImpl> databaseObjects) {
+		if ( isEmpty( databaseObjects ) ) {
+			return;
+		}
+
+		if ( databaseObjectRegistrations == null ) {
+			databaseObjectRegistrations = new ArrayList<>();
+		}
+
+		for ( JaxbDatabaseObjectImpl jaxbDatabaseObject : databaseObjects ) {
+			final JaxbDatabaseObjectImpl.JaxbDefinitionImpl definition = jaxbDatabaseObject.getDefinition();
+			final List<JaxbDatabaseObjectScopeImpl> dialectScopes = jaxbDatabaseObject.getDialectScopes();
+			final List<DialectScopeRegistration> scopeRegistrations = new ArrayList<>(dialectScopes.size());
+			for ( JaxbDatabaseObjectScopeImpl dialectScope : dialectScopes ) {
+				scopeRegistrations.add(
+						new DialectScopeRegistration(
+								dialectScope.getName(),
+								dialectScope.getContent(),
+								dialectScope.getMinimumVersion(),
+								dialectScope.getMaximumVersion() )
+				);
+			}
+			databaseObjectRegistrations.add( new DatabaseObjectRegistration(
+					jaxbDatabaseObject.getCreate(),
+					jaxbDatabaseObject.getDrop(),
+					definition != null ? definition.getClazz() : null,
+					scopeRegistrations ) );
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/DatabaseObjectRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/DatabaseObjectRegistration.java
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models.spi;
+
+import java.util.List;
+
+public record DatabaseObjectRegistration(String create, String drop, String definition, List<DialectScopeRegistration> dialectScopes ) {
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/DialectScopeRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/DialectScopeRegistration.java
@@ -0,0 +1,8 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models.spi;
+
+public record DialectScopeRegistration(String name, String content, String minimumVersion, String maximumVersion) {
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrations.java
@@ -52,6 +52,8 @@ public interface GlobalRegistrations {
 
 	Map<String, NamedStoredProcedureQueryRegistration> getNamedStoredProcedureQueryRegistrations();
 
+	List<DatabaseObjectRegistration>  getDatabaseObjectRegistrations();
+
 	// todo : named entity graphs
 
 	<T> T as(Class<T> type);

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public void apply(JaxbEntityMappingsImpl jaxbRoot, XmlDocumentContext xmlDocumen`
`85`	`85`
`86`	`86`	`getGlobalRegistrations().collectQueryReferences( jaxbRoot, xmlDocumentContext );`
`87`	`87`
	`88`	`+ getGlobalRegistrations().collectDataBaseObject( jaxbRoot.getDatabaseObjects() );`
`88`	`89`	`// todo (7.0) : named graphs?`
`89`	`90`	`}`
`90`	`91`