Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-17 08:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrea Boriero 2016-01-13 16:13:14 +00:00
parent 977c34bb59
commit d35e29dc29
6 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) {

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

@ -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) {

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

@ -152,4 +152,9 @@ public SequenceInformation locateSequenceInformation(QualifiedSequenceName seque
return sequenceInformationMap.get( sequenceName );
}
@Override
public void cleanup() {
extractionContext.cleanup();
}
}

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

@ -96,6 +96,7 @@ public DatabaseObjectAccess getDatabaseObjectAccess() {
return registeredTableAccess;
}
@Override
public void cleanup() {
if ( jdbcDatabaseMetaData != null ) {
jdbcDatabaseMetaData = null;

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

@ -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();
}

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

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