Author: gbadner Date: 2009-04-11 00:43:19 -0400 (Sat, 11 Apr 2009) New Revision: 16304 Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java Log: ANN-818 - @DiscriminatorFormula for an integer column with default discriminator type causes failure for DB2/Sybase Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java 2009-04-11 04:42:16 UTC (rev 16303) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java 2009-04-11 04:43:19 UTC (rev 16304) @@ -3,6 +3,8 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.DiscriminatorColumn; +import javax.persistence.DiscriminatorType; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Table; @@ -14,6 +16,7 @@ * @author Emmanuel Bernard */ @Entity +(a)DiscriminatorColumn(discriminatorType=DiscriminatorType.INTEGER) @DiscriminatorFormula("case when zik_type is null then 0 else zik_type end") @Table(uniqueConstraints = @UniqueConstraint(columnNames = {"avgBeat", "starred"} )) public abstract class Music {