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

SchemaManager.validation() should throw SchemaValidationException 

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-05-12 10:32:23 +02:00 committed by Steve Ebersole
parent 5caa0b2735
commit bf6a66d9ce
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import org.hibernate.cfg.AvailableSettings;
import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.relational.SchemaManager; import org.hibernate.relational.SchemaManager;
import org.hibernate.tool.schema.Action; import org.hibernate.tool.schema.Action;
import org.hibernate.tool.schema.spi.SchemaManagementException;
import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator; import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator;
import java.util.HashMap; import java.util.HashMap;
@ -92,8 +93,13 @@ public class SchemaManagerImpl implements SchemaManager {
@Override @Override
public void validate() throws SchemaValidationException { public void validate() throws SchemaValidationException {
try {
validateMappedObjects(); validateMappedObjects();
} }
catch ( SchemaManagementException sme ) {
throw new SchemaValidationException( sme.getMessage(), sme );
}
}
@Override @Override
public void truncate() { public void truncate() {

8
hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerDefaultSchemaTest.java
View File

@ -10,6 +10,7 @@ import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.persistence.SchemaValidationException;
import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DialectFeatureChecks;
@ -59,6 +60,13 @@ public class SchemaManagerDefaultSchemaTest {
catch (SchemaManagementException e) { catch (SchemaManagementException e) {
assertTrue( e.getMessage().contains("ForTesting") ); assertTrue( e.getMessage().contains("ForTesting") );
} }
try {
factory.getSchemaManager().validate();
fail();
}
catch (SchemaValidationException e) {
assertTrue( e.getMessage().contains("ForTesting") );
}
} }
@Entity(name="BookForTesting") @Entity(name="BookForTesting")

8
hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerExplicitSchemaTest.java
View File

@ -6,6 +6,7 @@
*/ */
package org.hibernate.orm.test.schemamanager; package org.hibernate.orm.test.schemamanager;
import jakarta.persistence.SchemaValidationException;
import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.tool.schema.spi.SchemaManagementException; import org.hibernate.tool.schema.spi.SchemaManagementException;
@ -65,6 +66,13 @@ public class SchemaManagerExplicitSchemaTest {
catch (SchemaManagementException e) { catch (SchemaManagementException e) {
assertTrue( e.getMessage().contains("ForTesting") ); assertTrue( e.getMessage().contains("ForTesting") );
} }
try {
factory.getSchemaManager().validate();
fail();
}
catch (SchemaValidationException e) {
assertTrue( e.getMessage().contains("ForTesting") );
}
} }
@Entity(name="BookForTesting") @Entity(name="BookForTesting")