Hibernate SVN: r15774 - in entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test: inheritance and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-01-14 07:39:07 -0500 (Wed, 14 Jan 2009)
New Revision: 15774
Modified:
entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/emops/Race.java
entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java
entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/lock/Lock.java
entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/ops/Workload.java
Log:
EJB-405 JBPAPP-1077 - Added explicit names for some columns and entities which uses reserved keywords in its names
Modified: entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/emops/Race.java
===================================================================
--- entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/emops/Race.java 2009-01-13 14:46:34 UTC (rev 15773)
+++ entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/emops/Race.java 2009-01-14 12:39:07 UTC (rev 15774)
@@ -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_2_1_GA_CP/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java
===================================================================
--- entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java 2009-01-13 14:46:34 UTC (rev 15773)
+++ entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java 2009-01-14 12:39:07 UTC (rev 15774)
@@ -1,6 +1,7 @@
//$Id: $
package org.hibernate.ejb.test.inheritance;
+import javax.persistence.Column;
import javax.persistence.Entity;
/**
@@ -10,6 +11,7 @@
public class Strawberry extends Fruit {
private Long size;
+ @Column(name="size_")
public Long getSize() {
return size;
}
Modified: entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/lock/Lock.java
===================================================================
--- entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/lock/Lock.java 2009-01-13 14:46:34 UTC (rev 15773)
+++ entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/lock/Lock.java 2009-01-14 12:39:07 UTC (rev 15774)
@@ -9,7 +9,7 @@
/**
* @author Emmanuel Bernard
*/
-@Entity
+@Entity(name="Lock_")
public class Lock {
private Integer id;
private Integer version;
Modified: entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/ops/Workload.java
===================================================================
--- entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/ops/Workload.java 2009-01-13 14:46:34 UTC (rev 15773)
+++ entitymanager/branches/v3_2_1_GA_CP/src/test/org/hibernate/ejb/test/ops/Workload.java 2009-01-14 12:39:07 UTC (rev 15774)
@@ -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;
}
17 years, 3 months