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

HV-361 Taking into account that applyDDL can be called multiple times. Adding comment that @Range annotation is automatically taken care of, because it is a composing constraint of @Min and @Max

This commit is contained in:
Hardy Ferentschik 2010-11-11 17:30:34 +01:00
parent ff47006731
commit ce56969173
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java
View File

@ -172,7 +172,9 @@ class TypeSafeActivator {
private static boolean applyConstraints(Set<ConstraintDescriptor<?>> constraintDescriptors, private static boolean applyConstraints(Set<ConstraintDescriptor<?>> constraintDescriptors,
Property property, Property property,
PropertyDescriptor propertyDesc, PropertyDescriptor propertyDesc,
Set<Class<?>> groups, boolean canApplyNotNull) { Set<Class<?>> groups,
boolean canApplyNotNull
) {
boolean hasNotNull = false; boolean hasNotNull = false;
for ( ConstraintDescriptor<?> descriptor : constraintDescriptors ) { for ( ConstraintDescriptor<?> descriptor : constraintDescriptors ) {
if ( groups != null && Collections.disjoint( descriptor.getGroups(), groups ) ) { if ( groups != null && Collections.disjoint( descriptor.getGroups(), groups ) ) {
@ -190,6 +192,8 @@ class TypeSafeActivator {
applyMax( property, descriptor ); applyMax( property, descriptor );
// apply hibernate validator specific constraints - we cannot import any HV specific classes though! // apply hibernate validator specific constraints - we cannot import any HV specific classes though!
// no need to check explicitly for @Range. @Range is a composed constraint using @Min and @Max which
// will be taken care later
applyLength( property, descriptor, propertyDesc ); applyLength( property, descriptor, propertyDesc );
// pass an empty set as composing constraints inherit the main constraint and thus are matching already // pass an empty set as composing constraints inherit the main constraint and thus are matching already
@ -226,7 +230,10 @@ class TypeSafeActivator {
} }
private static void applySQLCheck(Column col, String checkConstraint) { private static void applySQLCheck(Column col, String checkConstraint) {
if ( StringHelper.isNotEmpty( col.getCheckConstraint() ) ) { String existingCheck = col.getCheckConstraint();
// need to check whether the new check is already part of the existing check, because applyDDL can be called
// multiple times
if ( StringHelper.isNotEmpty( existingCheck ) && !existingCheck.contains( checkConstraint ) ) {
checkConstraint = col.getCheckConstraint() + " AND " + checkConstraint; checkConstraint = col.getCheckConstraint() + " AND " + checkConstraint;
} }
col.setCheckConstraint( checkConstraint ); col.setCheckConstraint( checkConstraint );