[hibernate-commits] Hibernate SVN: r16293 - in annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations: inheritance/union and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: gbadner
Date: 2009-04-10 15:17:45 -0400 (Fri, 10 Apr 2009)
New Revision: 16293

Modified:
   annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
   annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
   annotations/branches/v3_4_0_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_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java	2009-04-10 19:09:48 UTC (rev 16292)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java	2009-04-10 19:17:45 UTC (rev 16293)
@@ -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_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java	2009-04-10 19:09:48 UTC (rev 16292)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java	2009-04-10 19:17:45 UTC (rev 16293)
@@ -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_4_0_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java	2009-04-10 19:09:48 UTC (rev 16292)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java	2009-04-10 19:17:45 UTC (rev 16293)
@@ -24,7 +24,7 @@
 @Entity
 @Table(name="CHAOS")
 @SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, chaos_size, id) VALUES(upper(?),?,?,?)")
- at SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, cha0s_size = ? WHERE id = ?")
+ 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")