[hibernate-commits] Hibernate SVN: r15782 - in annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations: cascade and 4 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Wed Jan 14 09:36:53 EST 2009
Author: jcosta at redhat.com
Date: 2009-01-14 09:36:52 -0500 (Wed, 14 Jan 2009)
New Revision: 15782
Modified:
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java
Log:
JBPAPP-1073 - Fixed reserved keywords in Oracle for some models
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java 2009-01-14 14:15:30 UTC (rev 15781)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java 2009-01-14 14:36:52 UTC (rev 15782)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.test.annotations.access;
+import javax.persistence.Column;
import javax.persistence.Entity;
/**
@@ -8,5 +9,6 @@
*/
@Entity
public class BigBed extends Bed {
+ @Column(name="xsize")
public int size;
}
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java 2009-01-14 14:15:30 UTC (rev 15781)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java 2009-01-14 14:36:52 UTC (rev 15782)
@@ -2,7 +2,9 @@
package org.hibernate.test.annotations.cascade;
import java.util.Collection;
+
import javax.persistence.CascadeType;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@@ -16,6 +18,7 @@
@Id
@GeneratedValue
public Integer id;
+ @Column(name="xsize")
public int size;
@OneToMany(mappedBy = "mouth", cascade = CascadeType.REMOVE)
public Collection<Tooth> teeth;
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java 2009-01-14 14:15:30 UTC (rev 15781)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java 2009-01-14 14:36:52 UTC (rev 15782)
@@ -36,7 +36,7 @@
}
@AttributeOverrides({
- @AttributeOverride(name = "size", column = @Column(table = "BookSummary")),
+ @AttributeOverride(name = "size", column = @Column(table = "BookSummary", name="xsize")),
@AttributeOverride(name = "text", column = @Column(table = "BookSummary"))
})
public Summary getSummary() {
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java 2009-01-14 14:15:30 UTC (rev 15781)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java 2009-01-14 14:36:52 UTC (rev 15782)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.test.annotations.embedded;
+import javax.persistence.Column;
import javax.persistence.Embeddable;
import org.hibernate.annotations.Parent;
@@ -14,6 +15,7 @@
private String text;
private Book summarizedBook;
+ @Column(name="xsize")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java 2009-01-14 14:15:30 UTC (rev 15781)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java 2009-01-14 14:36:52 UTC (rev 15782)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.test.annotations.inheritance;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
@@ -21,6 +22,7 @@
public class Tomato extends Vegetable {
private int size;
+ @Column(name="xsize")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java 2009-01-14 14:15:30 UTC (rev 15781)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java 2009-01-14 14:36:52 UTC (rev 15782)
@@ -25,7 +25,7 @@
this.size = size;
}
- @Column(table = "DocumentMixed", nullable = false)
+ @Column(table = "DocumentMixed", nullable = false, name="xsize")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java 2009-01-14 14:15:30 UTC (rev 15781)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java 2009-01-14 14:36:52 UTC (rev 15782)
@@ -1,36 +1,38 @@
//$Id: $
package org.hibernate.test.annotations.query;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
+
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.NamedQuery;
+import javax.persistence.JoinColumn;
import javax.persistence.NamedNativeQuery;
import javax.persistence.OneToMany;
-import javax.persistence.JoinColumn;
+import javax.persistence.Table;
+import org.hibernate.annotations.Loader;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.SQLDeleteAll;
import org.hibernate.annotations.SQLInsert;
import org.hibernate.annotations.SQLUpdate;
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.SQLDeleteAll;
-import org.hibernate.annotations.Loader;
/**
* @author Emmanuel Bernard
*/
@Entity
@Table(name="CHAOS")
- at SQLInsert( sql="INSERT INTO CHAOS(name, nickname, size, id) VALUES(upper(?),?,?,?)")
- at SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nickname = ?, size = ? WHERE id = ?")
+ at SQLInsert( sql="INSERT INTO CHAOS(name, nickname, xsize, id) VALUES(upper(?),?,?,?)")
+ at SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nickname = ?, xsize = ? WHERE id = ?")
@SQLDelete( sql="DELETE CHAOS WHERE id = ?")
@SQLDeleteAll( sql="DELETE CHAOS")
@Loader(namedQuery = "chaos")
- at NamedNativeQuery(name="chaos", query="select id, size, name, lower( nickname ) as nickname from CHAOS where id= ?", resultClass = Chaos.class)
+ at NamedNativeQuery(name="chaos", query="select id, xsize, name, lower( nickname ) as nickname from CHAOS where id= ?", resultClass = Chaos.class)
public class Chaos {
@Id
private Long id;
+ @Column(name="xsize")
private Long size;
private String name;
private String nickname;
More information about the hibernate-commits
mailing list