[hibernate-commits] Hibernate SVN: r16292 - in annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations: cascade and 6 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Fri Apr 10 15:09:48 EDT 2009
Author: gbadner
Date: 2009-04-10 15:09:48 -0400 (Fri, 10 Apr 2009)
New Revision: 16292
Modified:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java
Log:
JBPAPP-1073 : Annotations - Oracle - "size" is reserved in Oracle
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -2,11 +2,13 @@
package org.hibernate.test.annotations.access;
import javax.persistence.Entity;
+import javax.persistence.Column;
/**
* @author Emmanuel Bernard
*/
@Entity
public class BigBed extends Bed {
+ @Column(name="bed_size")
public int size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -7,6 +7,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToMany;
+import javax.persistence.Column;
/**
* @author Emmanuel Bernard
@@ -16,6 +17,7 @@
@Id
@GeneratedValue
public Integer id;
+ @Column(name="mouth_size")
public int size;
@OneToMany(mappedBy = "mouth", cascade = CascadeType.REMOVE)
public Collection<Tooth> teeth;
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -36,7 +36,7 @@
}
@AttributeOverrides({
- @AttributeOverride(name = "size", column = @Column(table = "BookSummary")),
+ @AttributeOverride(name = "size", column = @Column(name="summ_size", table = "BookSummary")),
@AttributeOverride(name = "text", column = @Column(table = "BookSummary"))
})
public Summary getSummary() {
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.embedded;
import javax.persistence.Embeddable;
+import javax.persistence.Column;
import org.hibernate.annotations.Parent;
@@ -14,6 +15,7 @@
private String text;
private Book summarizedBook;
+ @Column(name="summary_size")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -4,6 +4,7 @@
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
+import javax.persistence.Column;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
@@ -21,6 +22,7 @@
public class Tomato extends Vegetable {
private int size;
+ @Column(name="tom_size")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -6,6 +6,7 @@
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
+import javax.persistence.Column;
/**
* @author Emmanuel Bernard
@@ -27,6 +28,7 @@
this.id = id;
}
+ @Column(name = "cloth_size")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -4,15 +4,12 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import org.hibernate.annotations.ForeignKey;
-
/**
* @author Emmanuel Bernard
*/
@Entity
- at ForeignKey(name = "FK_DOCU_FILE")
public class Document extends File {
- @Column(nullable = false)
+ @Column(nullable = false, name="xsize")
private int size;
Document() {
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -25,7 +25,7 @@
this.size = size;
}
- @Column(table = "DocumentMixed", nullable = false)
+ @Column(table = "DocumentMixed", name="doc_size", nullable = false)
public int getSize() {
return size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.test.annotations.inheritance.union;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -20,6 +21,7 @@
this.size = size;
}
+ @Column(name="xsize")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.test.annotations.query;
import java.util.Set;
@@ -23,15 +23,16 @@
*/
@Entity
@Table(name="CHAOS")
- at SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, size, id) VALUES(upper(?),?,?,?)")
- at SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, size = ? WHERE id = ?")
+ at SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, chaos_size, id) VALUES(upper(?),?,?,?)")
+ at SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, chaos_size = ? 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( nick_name ) as nick_name from CHAOS where id= ?", resultClass = Chaos.class)
+ at NamedNativeQuery(name="chaos", query="select id, chaos_size, name, lower( nick_name ) as nick_name from CHAOS where id= ?", resultClass = Chaos.class)
public class Chaos {
@Id
private Long id;
+ @Column(name="chaos_size")
private Long size;
private String name;
@Column(name="nick_name")
More information about the hibernate-commits
mailing list