[hibernate-commits] Hibernate SVN: r16599 - in entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test: inheritance and 2 other directories.

Author: jcosta(a)redhat.com Date: 2009-05-19 09:26:30 -0400 (Tue, 19 May 2009) New Revision: 16599 Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/emops/Race.java entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/lock/Lock.java entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/ops/Workload.java Log: EJB-405 JBPAPP-1077 - Backported: Added explicit names for some columns and entities which uses reserved keywords in its names Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/emops/Race.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/emops/Race.java 2009-05-19 13:25:47 UTC (rev 16598) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/emops/Race.java 2009-05-19 13:26:30 UTC (rev 16599) @@ -18,7 +18,7 @@ @Entity public class Race { @Id @GeneratedValue public Integer id; - @IndexColumn( name="index" ) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @IndexColumn( name="index_" ) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) @org.hibernate.annotations.Cascade( { org.hibernate.annotations.CascadeType.ALL, org.hibernate.annotations.CascadeType.DELETE_ORPHAN }) public List<Competitor> competitors = new ArrayList<Competitor>(); public String name; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java 2009-05-19 13:25:47 UTC (rev 16598) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java 2009-05-19 13:26:30 UTC (rev 16599) @@ -1,6 +1,7 @@ //$Id: $ package org.hibernate.ejb.test.inheritance; +import javax.persistence.Column; import javax.persistence.Entity; /** @@ -8,6 +9,7 @@ */ @Entity public class Strawberry extends Fruit { + @Column(name="size_") private Long size; public Long getSize() { Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/lock/Lock.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/lock/Lock.java 2009-05-19 13:25:47 UTC (rev 16598) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/lock/Lock.java 2009-05-19 13:26:30 UTC (rev 16599) @@ -9,7 +9,7 @@ /** * @author Emmanuel Bernard */ -@Entity +@Entity(name="Lock_") public class Lock { private Integer id; private Integer version; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/ops/Workload.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/ops/Workload.java 2009-05-19 13:25:47 UTC (rev 16598) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/ops/Workload.java 2009-05-19 13:26:30 UTC (rev 16599) @@ -1,6 +1,7 @@ //$Id$ package org.hibernate.ejb.test.ops; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -14,5 +15,6 @@ @GeneratedValue public Integer id; public String name; + @Column(name="load_") public Integer load; }