Author: stliu Date: 2010-01-09 10:20:24 -0500 (Sat, 09 Jan 2010) New Revision: 18477 Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java Log: JBPAPP-3375 HHH-4773 unit tests fail cos db2 doesn't allow primary key column nullable Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java 2010-01-09 14:35:37 UTC (rev 18476) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java 2010-01-09 15:20:24 UTC (rev 18477) @@ -14,11 +14,11 @@ public class AId implements Serializable { @OneToOne - @JoinColumn( name = "bid" ) + @JoinColumn( name = "bid",nullable=false ) private B b; @OneToOne - @JoinColumn( name = "cid" ) + @JoinColumn( name = "cid",nullable=false ) private C c; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java 2010-01-09 14:35:37 UTC (rev 18476) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java 2010-01-09 15:20:24 UTC (rev 18477) @@ -17,8 +17,8 @@ public int nthChild; @ManyToOne() @JoinColumns({ - @JoinColumn(name = "parentLastName", referencedColumnName = "p_lname"), - @JoinColumn(name = "parentFirstName", referencedColumnName = "firstName") + @JoinColumn(name = "parentLastName", referencedColumnName = "p_lname",nullable=false), + @JoinColumn(name = "parentFirstName", referencedColumnName = "firstName",nullable=false) }) public Parent parent; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java 2010-01-09 14:35:37 UTC (rev 18476) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java 2010-01-09 15:20:24 UTC (rev 18477) @@ -13,7 +13,7 @@ * @author Emmanuel Bernard */ @Entity -@AssociationOverride(name = "id.channel", joinColumns = @JoinColumn(name = "chan_id")) +@AssociationOverride(name = "id.channel", joinColumns = @JoinColumn(name = "chan_id",nullable=false)) public class TvMagazin { @EmbeddedId public TvMagazinPk id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java 2010-01-09 14:35:37 UTC (rev 18476) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java 2010-01-09 15:20:24 UTC (rev 18477) @@ -2,7 +2,9 @@ package org.hibernate.test.annotations.cid; import java.io.Serializable; + import javax.persistence.Embeddable; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; /** @@ -11,8 +13,10 @@ @Embeddable public class TvMagazinPk implements Serializable { @ManyToOne + @JoinColumn(nullable=false) public Channel channel; //public String name; @ManyToOne + @JoinColumn(nullable=false) public Presenter presenter; }