Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11914 : SchemaUpdate.setHaltOnError(true) does nothing

This commit is contained in:
Gail Badner 2017-08-07 17:39:50 -07:00 committed by Vlad Mihalcea
parent 1f7aac9979
commit cd7611e511
3 changed files with 122 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,8 @@ import org.hibernate.internal.log.DeprecationLogger;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.tool.schema.TargetType;
import org.hibernate.tool.schema.internal.ExceptionHandlerCollectingImpl;
import org.hibernate.tool.schema.internal.ExceptionHandlerHaltImpl;
import org.hibernate.tool.schema.spi.ExceptionHandler;
import org.hibernate.tool.schema.spi.ExecutionOptions;
import org.hibernate.tool.schema.spi.SchemaManagementTool;
import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator;
@ -50,6 +52,8 @@ public class SchemaUpdate {
private final List<Exception> exceptions = new ArrayList<Exception>();
boolean haltOnError = false;
private String outputFile;
private String delimiter;
private boolean format;
@ -75,7 +79,10 @@ public class SchemaUpdate {
final SchemaManagementTool tool = serviceRegistry.getService( SchemaManagementTool.class );
final ExceptionHandlerCollectingImpl exceptionHandler = new ExceptionHandlerCollectingImpl();
final ExceptionHandler exceptionHandler = haltOnError
? ExceptionHandlerHaltImpl.INSTANCE
: new ExceptionHandlerCollectingImpl();
final ExecutionOptions executionOptions = SchemaManagementToolCoordinator.buildExecutionOptions(
config,
exceptionHandler
@ -87,7 +94,9 @@ public class SchemaUpdate {
tool.getSchemaMigrator( config ).doMigration( metadata, executionOptions, targetDescriptor );
}
finally {
exceptions.addAll( exceptionHandler.getExceptions() );
if ( exceptionHandler instanceof ExceptionHandlerCollectingImpl ) {
exceptions.addAll( ( (ExceptionHandlerCollectingImpl) exceptionHandler ).getExceptions() );
}
}
}
@ -101,6 +110,7 @@ public class SchemaUpdate {
}
public SchemaUpdate setHaltOnError(boolean haltOnError) {
this.haltOnError = haltOnError;
return this;
}

68
hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java Normal file
View File

@ -0,0 +1,68 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.schemaupdate;
import java.util.Map;
import javax.persistence.Entity;
import javax.persistence.Id;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.tool.schema.spi.SchemaManagementException;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
/**
* @author Vlad Mihalcea
*/
public class SchemaMigratorHaltOnErrorTest extends BaseEntityManagerFunctionalTestCase {
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class<?>[] {
From.class
};
}
@Override
protected Map buildSettings() {
Map settings = super.buildSettings();
settings.put( AvailableSettings.HBM2DDL_AUTO, "update" );
settings.put( AvailableSettings.HBM2DDL_HALT_ON_ERROR, true );
return settings;
}
@Override
public void buildEntityManagerFactory() throws Exception {
try {
super.buildEntityManagerFactory();
fail("Should halt on error!");
}
catch ( Exception e ) {
SchemaManagementException cause = (SchemaManagementException) e.getCause();
assertEquals("Halting on error : Error executing DDL via JDBC Statement", cause.getMessage());
}
}
@Test
public void testHaltOnError() {
}
@Entity(name = "From")
public class From {
@Id
private Integer id;
private String table;
private String select;
}
}

70
hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java
View File

@ -6,14 +6,24 @@
*/
package org.hibernate.test.schemaupdate;
import java.util.Map;
import java.io.File;
import java.io.IOException;
import java.util.EnumSet;
import javax.persistence.Entity;
import javax.persistence.Id;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.hbm2ddl.SchemaUpdate;
import org.hibernate.tool.schema.TargetType;
import org.hibernate.tool.schema.spi.SchemaManagementException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@ -21,38 +31,42 @@ import static org.junit.Assert.fail;
/**
* @author Vlad Mihalcea
* @author Gail Badner
*/
public class SchemaUpdateHaltOnErrorTest extends BaseEntityManagerFunctionalTestCase {
public class SchemaUpdateHaltOnErrorTest {
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class<?>[] {
From.class
};
private File output;
private StandardServiceRegistry ssr;
private MetadataImplementor metadata;
@Before
public void setUp() throws IOException {
output = File.createTempFile( "update_script", ".sql" );
output.deleteOnExit();
ssr = new StandardServiceRegistryBuilder().build();
final MetadataSources metadataSources = new MetadataSources( ssr )
.addAnnotatedClass( From.class );
metadata = (MetadataImplementor) metadataSources.buildMetadata();
}
@Override
protected Map buildSettings() {
Map settings = super.buildSettings();
settings.put( AvailableSettings.HBM2DDL_AUTO, "update" );
settings.put( AvailableSettings.HBM2DDL_HALT_ON_ERROR, true );
return settings;
}
@Override
public void buildEntityManagerFactory() throws Exception {
try {
super.buildEntityManagerFactory();
fail("Should halt on error!");
}
catch ( Exception e ) {
SchemaManagementException cause = (SchemaManagementException) e.getCause();
assertEquals("Halting on error : Error executing DDL via JDBC Statement", cause.getMessage());
}
@After
public void tearsDown() {
// there shouldn't be anything to clean up
StandardServiceRegistryBuilder.destroy( ssr );
}
@Test
public void testHaltOnError() {
try {
new SchemaUpdate().setHaltOnError( true )
.execute( EnumSet.of( TargetType.DATABASE ), metadata );
fail( "Should halt on error!" );
}
catch ( Exception e ) {
SchemaManagementException cause = (SchemaManagementException) e;
assertEquals("Halting on error : Error executing DDL via JDBC Statement", cause.getMessage());
}
}
@Entity(name = "From")
@ -65,4 +79,4 @@ public class SchemaUpdateHaltOnErrorTest extends BaseEntityManagerFunctionalTest
private String select;
}
}
}