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

hibernate · Jan 13, 2016 · 8dd86a2 · 8dd86a2
1 parent a982b56
commit 8dd86a2
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
@@ -130,7 +130,12 @@ public void execute(Target target) {
 			);
 		}
 
-		schemaMigrator.doMigration( metadata, databaseInformation, true, toolTargets );
+		try {
+			schemaMigrator.doMigration( metadata, databaseInformation, true, toolTargets );
+		}
+		finally {
+			databaseInformation.cleanup();
+		}
 	}
 
 	private List<org.hibernate.tool.schema.spi.Target> buildToolTargets(Target target) {

diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
@@ -86,9 +86,13 @@ public void validate() {
 					"Error creating DatabaseInformation for schema validation"
 			);
 		}
-
-		serviceRegistry.getService( SchemaManagementTool.class ).getSchemaValidator( cfgService.getSettings() )
-				.doValidation( metadata, databaseInformation );
+		try {
+			serviceRegistry.getService( SchemaManagementTool.class ).getSchemaValidator( cfgService.getSettings() )
+					.doValidation( metadata, databaseInformation );
+		}
+		finally {
+			databaseInformation.cleanup();
+		}
 	}
 
 	public static void main(String[] args) {

diff --git a/...ore/src/main/java/org/hibernate/tool/schema/extract/internal/DatabaseInformationImpl.java b/...ore/src/main/java/org/hibernate/tool/schema/extract/internal/DatabaseInformationImpl.java
@@ -152,4 +152,9 @@ public SequenceInformation locateSequenceInformation(QualifiedSequenceName seque
 
 		return sequenceInformationMap.get( sequenceName );
 	}
+
+	@Override
+	public void cleanup() {
+		extractionContext.cleanup();
+	}
 }
diff --git a/...-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java b/...-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java
@@ -96,6 +96,7 @@ public DatabaseObjectAccess getDatabaseObjectAccess() {
 		return registeredTableAccess;
 	}
 
+	@Override
 	public void cleanup() {
 		if ( jdbcDatabaseMetaData != null ) {
 			jdbcDatabaseMetaData = null;

diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/DatabaseInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/DatabaseInformation.java
@@ -101,4 +101,6 @@ public SequenceInformation getSequenceInformation(
 	 * @return {@code true} indicates a catalog with the given name already exists
 	 */
 	boolean catalogExists(Identifier catalog);
+
+	void cleanup();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ExtractionContext.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ExtractionContext.java
@@ -40,4 +40,6 @@ interface DatabaseObjectAccess {
 	}
 
 	DatabaseObjectAccess getDatabaseObjectAccess();
+
+	void cleanup();
 }