[hibernate-commits] Hibernate SVN: r10276 - in trunk/HibernateExt/metadata/src: java/org/hibernate/cfg java/org/hibernate/cfg/annotations test/org/hibernate/test/annotations test/org/hibernate/test/annotations/duplicatedgenerator test/org/hibernate/test/annotations/id

Author: epbernard Date: 2006-08-17 12:07:03 -0400 (Thu, 17 Aug 2006) New Revision: 10276 Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java Log: ANN-369 replace key by mapkey for the default column value Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -1347,7 +1347,7 @@ collectionBinder.setPropertyAccessorName( inferredData.getDefaultAccess() ); Ejb3Column[] elementColumns = null; - PropertyData wrappedInferredData = new WrappedInferredData( inferredData, "element" ); + PropertyData mapKeyVirtualProperty = new WrappedInferredData( inferredData, "element" ); if ( property.isAnnotationPresent( Column.class ) || property.isAnnotationPresent( Formula.class ) ) { @@ -1358,7 +1358,7 @@ formulaAnn, nullability, propertyHolder, - wrappedInferredData, + mapKeyVirtualProperty, entityBinder.getSecondaryTables(), mappings ); @@ -1366,7 +1366,7 @@ else if ( property.isAnnotationPresent( Columns.class ) ) { Columns anns = property.getAnnotation( Columns.class ); elementColumns = Ejb3Column.buildColumnFromAnnotation( - anns.columns(), null, nullability, propertyHolder, wrappedInferredData, + anns.columns(), null, nullability, propertyHolder, mapKeyVirtualProperty, entityBinder.getSecondaryTables(), mappings ); } @@ -1376,7 +1376,7 @@ null, nullability, propertyHolder, - wrappedInferredData, + mapKeyVirtualProperty, entityBinder.getSecondaryTables(), mappings ); @@ -1385,13 +1385,13 @@ org.hibernate.annotations.MapKey hibMapKeyAnn = property.getAnnotation( org.hibernate.annotations.MapKey.class ); - wrappedInferredData = new WrappedInferredData( inferredData, "key" ); + mapKeyVirtualProperty = new WrappedInferredData( inferredData, "mapkey" ); Ejb3Column[] mapColumns = Ejb3Column.buildColumnFromAnnotation( hibMapKeyAnn != null && hibMapKeyAnn.columns().length > 0 ? hibMapKeyAnn.columns() : null, null, Nullability.FORCED_NOT_NULL, propertyHolder, - wrappedInferredData, + mapKeyVirtualProperty, entityBinder.getSecondaryTables(), mappings ); @@ -1401,7 +1401,7 @@ Ejb3JoinColumn[] mapJoinColumns = Ejb3JoinColumn.buildJoinColumns( mapKeyManyToMany != null ? mapKeyManyToMany.joinColumns() : null, null, entityBinder.getSecondaryTables(), - propertyHolder, wrappedInferredData.getPropertyName(), mappings + propertyHolder, mapKeyVirtualProperty.getPropertyName(), mappings ); collectionBinder.setMapKeyManyToManyColumns( mapJoinColumns ); Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java =================================================================== --- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -6,6 +6,7 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.AnnotationException; import org.hibernate.MappingException; +import org.hibernate.util.StringHelper; import org.hibernate.annotations.OrderBy; import org.hibernate.annotations.Sort; import org.hibernate.cfg.CollectionSecondPass; @@ -74,7 +75,7 @@ if ( indexColumn.isImplicit() == false ) { PropertyHolder valueHolder = PropertyHolderBuilder.buildPropertyHolder( this.collection, - this.collection.getRole() + "key", + StringHelper.qualify( this.collection.getRole(), "key" ), (XClass) null, (XProperty) null, mappings ); Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java =================================================================== --- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -146,7 +146,7 @@ holder = PropertyHolderBuilder.buildPropertyHolder( mapValue, - mapValue.getRole() + "key", + StringHelper.qualify( mapValue.getRole(), "mapkey" ), elementClass, property, mappings ); Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -5,7 +5,7 @@ @javax.persistence.TableGenerator( name = "EMP_GEN", table = "GENERATOR_TABLE", - pkColumnName = "key", + pkColumnName = "pkey", valueColumnName = "hi", pkColumnValue = "EMP", allocationSize = 20 Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -14,7 +14,7 @@ * * @author Emmanuel Bernard */ -@TableGenerator(name = "EMP_GEN", table = "GENERATOR_TABLE", pkColumnName = "key", +@TableGenerator(name = "EMP_GEN", table = "GENERATOR_TABLE", pkColumnName = "pkey", valueColumnName = "hi", pkColumnValue = "Ball", allocationSize = 10) @Entity public class Ball implements Serializable { Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -16,7 +16,7 @@ */ @Entity @Table(name = "tbl_dog") -@TableGenerator(name = "DogGen", table = "GENERATOR_TABLE", pkColumnName = "key", +@TableGenerator(name = "DogGen", table = "GENERATOR_TABLE", pkColumnName = "pkey", valueColumnName = "hi", pkColumnValue = "Dog", allocationSize = 10) public class Dog { private Integer id; Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -6,7 +6,7 @@ @TableGenerator( name = "EMP_GEN", table = "GENERATOR_TABLE", - pkColumnName = "key", + pkColumnName = "pkey", valueColumnName = "hi", pkColumnValue = "EMP", allocationSize = 20