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-7427 : Ensure version column is non-nullable

Browse Source
This commit is contained in:
Gail Badner 2012-07-03 16:19:03 -07:00
parent 6f23941c29
commit bc3964ba98
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java
View File

@ -1616,6 +1616,12 @@ private void bindVersion( final EntityBinding rootEntityBinding, final VersionAt
}
final EntityVersion version = rootEntityBinding.getHierarchyDetails().getEntityVersion();
version.setVersioningAttributeBinding( ( BasicAttributeBinding ) bindAttribute( rootEntityBinding, versionAttributeSource ) );
// ensure version is non-nullable
for ( RelationalValueBinding valueBinding : version.getVersioningAttributeBinding().getRelationalValueBindings() ) {
if ( valueBinding.getValue() instanceof Column ) {
( (Column) valueBinding.getValue() ).setNullable( false );
}
}
version.setUnsavedValue(
versionAttributeSource.getUnsavedValue() == null
? "undefined"

5
hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/RelationalValueBinding.java
View File

@ -41,14 +41,12 @@ public class RelationalValueBinding {
private final boolean includeInInsert;
private final boolean includeInUpdate;
private final boolean isDerived;
private final boolean isNullable;
public RelationalValueBinding(final DerivedValue value) {
this.value = value;
this.includeInInsert = false;
this.includeInUpdate = false;
this.isDerived = true;
this.isNullable = true;
}
public RelationalValueBinding(final Column value, final boolean includeInInsert, final boolean includeInUpdate) {
@ -56,7 +54,6 @@ public RelationalValueBinding(final Column value, final boolean includeInInsert,
this.includeInInsert = includeInInsert;
this.includeInUpdate = includeInUpdate;
this.isDerived = false;
this.isNullable = value.isNullable();
}
/**
@ -83,7 +80,7 @@ public boolean isDerived() {
* @return {@code true} indicates the bound value is derived or a column not marked as non-null.
*/
public boolean isNullable() {
return isNullable;
return isDerived() || ( (Column) value ).isNullable();
}
/**

5
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java
View File

@ -107,6 +107,11 @@ public void testSimpleVersionedEntityMapping() {
assertNotNull( entityBinding.getHierarchyDetails().getEntityVersion().getVersioningAttributeBinding() );
assertNotNull( entityBinding.getHierarchyDetails().getEntityVersion().getVersioningAttributeBinding().getAttribute() );
final BasicAttributeBinding versionAttributeBinding =
entityBinding.getHierarchyDetails().getEntityVersion().getVersioningAttributeBinding();
assertEquals( "does not have 1 relational binding", 1, versionAttributeBinding.getRelationalValueBindings().size() );
assertEquals( "version is nullable", false, versionAttributeBinding.getRelationalValueBindings().get( 0 ).isNullable() );
}
@Test