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

HHH-6372 : Provide a temporary way to initialize basic types in metamodel

This commit is contained in:
Gail Badner 2011-06-29 14:05:28 -07:00
parent ff312720ce
commit 0f88ec8b71
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/AttributeTypeResolver.java
View File

@ -60,6 +60,9 @@ class AttributeTypeResolver {
Type type = resolveHibernateType( attributeBinding ); Type type = resolveHibernateType( attributeBinding );
if ( type != null && ! type.isAssociationType() && ! type.isCollectionType() && ! type.isComponentType() ) { if ( type != null && ! type.isAssociationType() && ! type.isCollectionType() && ! type.isComponentType() ) {
resolveJavaType( attributeBinding.getAttribute(), type ); resolveJavaType( attributeBinding.getAttribute(), type );
for ( Value value : attributeBinding.getValues() ) {
resolveSqlType( value, type );
}
} }
} }
} }

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

@ -23,15 +23,22 @@
*/ */
package org.hibernate.metamodel.binding; package org.hibernate.metamodel.binding;
import java.sql.Types;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import junit.framework.Assert;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.hibernate.metamodel.MetadataSources; import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.domain.BasicType;
import org.hibernate.metamodel.domain.SingularAttribute;
import org.hibernate.metamodel.domain.TypeNature;
import org.hibernate.metamodel.relational.Column; import org.hibernate.metamodel.relational.Column;
import org.hibernate.metamodel.relational.Datatype;
import org.hibernate.metamodel.relational.SimpleValue;
import org.hibernate.metamodel.source.internal.MetadataImpl; import org.hibernate.metamodel.source.internal.MetadataImpl;
import org.hibernate.metamodel.source.spi.MetadataImplementor; import org.hibernate.metamodel.source.spi.MetadataImplementor;
import org.hibernate.service.BasicServiceRegistry; import org.hibernate.service.BasicServiceRegistry;
@ -132,15 +139,45 @@ public abstract class AbstractBasicBindingTests extends BaseUnitTestCase {
assertNotNull( idAttributeBinding ); assertNotNull( idAttributeBinding );
assertSame( idAttributeBinding, entityBinding.getEntityIdentifier().getValueBinding() ); assertSame( idAttributeBinding, entityBinding.getEntityIdentifier().getValueBinding() );
assertSame( LongType.INSTANCE, idAttributeBinding.getHibernateTypeDescriptor().getExplicitType() ); assertSame( LongType.INSTANCE, idAttributeBinding.getHibernateTypeDescriptor().getExplicitType() );
assertTrue( idAttributeBinding.getAttribute().isSingular() );
assertNotNull( idAttributeBinding.getAttribute() ); assertNotNull( idAttributeBinding.getAttribute() );
SingularAttribute singularIdAttribute = ( SingularAttribute ) idAttributeBinding.getAttribute();
assertSame( TypeNature.BASIC, singularIdAttribute.getSingularAttributeType().getNature() );
BasicType basicIdAttributeType = ( BasicType ) singularIdAttribute.getSingularAttributeType();
assertSame( Long.class, basicIdAttributeType.getJavaType().getClassReference() );
assertNotNull( idAttributeBinding.getValue() ); assertNotNull( idAttributeBinding.getValue() );
assertTrue( idAttributeBinding.getValue() instanceof Column ); assertTrue( idAttributeBinding.getValue() instanceof Column );
Datatype idDataType = ( (Column) idAttributeBinding.getValue() ).getDatatype();
assertSame( Long.class, idDataType.getJavaType() );
assertSame( Types.BIGINT, idDataType.getTypeCode() );
assertSame( LongType.INSTANCE.getName(), idDataType.getTypeName() );
AttributeBinding nameBinding = entityBinding.getAttributeBinding( "name" ); AttributeBinding nameBinding = entityBinding.getAttributeBinding( "name" );
assertNotNull( nameBinding ); assertNotNull( nameBinding );
assertSame( StringType.INSTANCE, nameBinding.getHibernateTypeDescriptor().getExplicitType() ); assertSame( StringType.INSTANCE, nameBinding.getHibernateTypeDescriptor().getExplicitType() );
assertNotNull( nameBinding.getAttribute() ); assertNotNull( nameBinding.getAttribute() );
assertNotNull( nameBinding.getValue() ); assertNotNull( nameBinding.getValue() );
assertTrue( nameBinding.getAttribute().isSingular() );
assertNotNull( nameBinding.getAttribute() );
SingularAttribute singularNameAttribute = ( SingularAttribute ) nameBinding.getAttribute();
assertSame( TypeNature.BASIC, singularNameAttribute.getSingularAttributeType().getNature() );
BasicType basicNameAttributeType = ( BasicType ) singularNameAttribute.getSingularAttributeType();
assertSame( String.class, basicNameAttributeType.getJavaType().getClassReference() );
assertNotNull( nameBinding.getValue() );
// until HHH-6380 is fixed, need to call getValues()
assertEquals( 1, nameBinding.getValuesSpan() );
Iterator<SimpleValue> it = nameBinding.getValues().iterator();
assertTrue( it.hasNext() );
SimpleValue nameValue = it.next();
assertTrue( nameValue instanceof Column );
Datatype nameDataType = nameValue.getDatatype();
assertSame( String.class, nameDataType.getJavaType() );
assertSame( Types.VARCHAR, nameDataType.getTypeCode() );
assertSame( StringType.INSTANCE.getName(), nameDataType.getTypeName() );
} }
protected void assertRoot(MetadataImplementor metadata, EntityBinding entityBinding) { protected void assertRoot(MetadataImplementor metadata, EntityBinding entityBinding) {