HHH-10433 - Fix hbm2ddl utils has a problem - release jdbc connection

hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java

@@ -130,8 +130,13 @@ public class SchemaUpdate {
 			);
 		}
 
+		try {
 			schemaMigrator.doMigration( metadata, databaseInformation, true, toolTargets );
 		}
+		finally {
+			databaseInformation.cleanup();
+		}
+	}
 
 	private List<org.hibernate.tool.schema.spi.Target> buildToolTargets(Target target) {
 		List<org.hibernate.tool.schema.spi.Target> toolTargets = new ArrayList<org.hibernate.tool.schema.spi.Target>();

hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java

@@ -86,10 +86,14 @@ public class SchemaValidator {
 					"Error creating DatabaseInformation for schema validation"
 			);
 		}
-
+		try {
 			serviceRegistry.getService( SchemaManagementTool.class ).getSchemaValidator( cfgService.getSettings() )
 					.doValidation( metadata, databaseInformation );
 		}
+		finally {
+			databaseInformation.cleanup();
+		}
+	}
 
 	public static void main(String[] args) {
 		try {

hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/DatabaseInformationImpl.java

@@ -152,4 +152,9 @@ public class DatabaseInformationImpl implements DatabaseInformation, ExtractionC
 
 		return sequenceInformationMap.get( sequenceName );
 	}
+
+	@Override
+	public void cleanup() {
+		extractionContext.cleanup();
+	}
 }

hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java

@@ -96,6 +96,7 @@ public class ExtractionContextImpl implements ExtractionContext {
 		return registeredTableAccess;
 	}
 
+	@Override
 	public void cleanup() {
 		if ( jdbcDatabaseMetaData != null ) {
 			jdbcDatabaseMetaData = null;

hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/DatabaseInformation.java

@@ -101,4 +101,6 @@ public interface DatabaseInformation {
 	 * @return {@code true} indicates a catalog with the given name already exists
 	 */
 	boolean catalogExists(Identifier catalog);
+
+	void cleanup();
 }

hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ExtractionContext.java

@@ -40,4 +40,6 @@ public interface ExtractionContext {
 	}
 
 	DatabaseObjectAccess getDatabaseObjectAccess();
+
+	void cleanup();
 }