HHH-19580 add ability to target a given schema/catalog in SchemaManager

Author: gavinking

hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java

@@ -94,4 +94,23 @@ public interface SchemaManager extends jakarta.persistence.SchemaManager {
 	 */
 	@Incubating
 	void populate();
+
+	/**
+	 * Obtain an instance which targets the given schema.
+	 * @param schemaName The name of the schema to target
+	 *
+	 * @since 7.1
+	 */
+	@Incubating
+	SchemaManager forSchema(String schemaName);
+
+	/**
+	 * Obtain an instance which targets the given schema of the given catalog.
+	 * @param schemaName The name of the schema to target
+	 * @param catalogName The name of the catalog to target
+	 *
+	 * @since 7.1
+	 */
+	@Incubating
+	SchemaManager forSchemaAndCatalog(String schemaName, String catalogName);
 }

hibernate-core/src/main/java/org/hibernate/relational/internal/SchemaManagerImpl.java

@@ -26,12 +26,33 @@
 public class SchemaManagerImpl implements SchemaManager {
 	private final SessionFactoryImplementor sessionFactory;
 	private final MetadataImplementor metadata;
+	private final String schemaName;
+	private final String catalogName;
 
 	public SchemaManagerImpl(
 			SessionFactoryImplementor sessionFactory,
 			MetadataImplementor metadata) {
+		this( sessionFactory, metadata, null, null );
+	}
+
+	public SchemaManagerImpl(
+			SessionFactoryImplementor sessionFactory,
+			MetadataImplementor metadata,
+			String schemaName, String catalogName) {
 		this.sessionFactory = sessionFactory;
 		this.metadata = metadata;
+		this.schemaName = schemaName;
+		this.catalogName = catalogName;
+	}
+
+	@Override
+	public SchemaManager forSchema(String schemaName) {
+		return new SchemaManagerImpl( sessionFactory, metadata, schemaName, null );
+	}
+
+	@Override
+	public SchemaManager forSchemaAndCatalog(String schemaName, String catalogName) {
+		return new SchemaManagerImpl( sessionFactory, metadata, schemaName, catalogName );
 	}
 
 	@Override
@@ -40,6 +61,8 @@ public void exportMappedObjects(boolean createSchemas) {
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, Action.CREATE_ONLY );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, Action.NONE );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS, createSchemas );
+		properties.put( AvailableSettings.DEFAULT_SCHEMA, schemaName );
+		properties.put( AvailableSettings.DEFAULT_CATALOG, catalogName );
 		SchemaManagementToolCoordinator.process(
 				metadata,
 				sessionFactory.getServiceRegistry(),
@@ -54,6 +77,8 @@ public void dropMappedObjects(boolean dropSchemas) {
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, Action.DROP );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, Action.NONE );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS, dropSchemas );
+		properties.put( AvailableSettings.DEFAULT_SCHEMA, schemaName );
+		properties.put( AvailableSettings.DEFAULT_CATALOG, catalogName );
 		SchemaManagementToolCoordinator.process(
 				metadata,
 				sessionFactory.getServiceRegistry(),
@@ -68,6 +93,8 @@ public void validateMappedObjects() {
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, Action.VALIDATE );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, Action.NONE );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS, false );
+		properties.put( AvailableSettings.DEFAULT_SCHEMA, schemaName );
+		properties.put( AvailableSettings.DEFAULT_CATALOG, catalogName );
 		SchemaManagementToolCoordinator.process(
 				metadata,
 				sessionFactory.getServiceRegistry(),
@@ -81,6 +108,8 @@ public void truncateMappedObjects() {
 		Map<String, Object> properties = new HashMap<>( sessionFactory.getProperties() );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, Action.TRUNCATE );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, Action.NONE );
+		properties.put( AvailableSettings.DEFAULT_SCHEMA, schemaName );
+		properties.put( AvailableSettings.DEFAULT_CATALOG, catalogName );
 		SchemaManagementToolCoordinator.process(
 				metadata,
 				sessionFactory.getServiceRegistry(),
@@ -94,6 +123,8 @@ public void populate() {
 		Map<String, Object> properties = new HashMap<>( sessionFactory.getProperties() );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, Action.POPULATE );
 		properties.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, Action.NONE );
+		properties.put( AvailableSettings.DEFAULT_SCHEMA, schemaName );
+		properties.put( AvailableSettings.DEFAULT_CATALOG, catalogName );
 		SchemaManagementToolCoordinator.process(
 				metadata,
 				sessionFactory.getServiceRegistry(),