From 7d36b9dfd368b9acb5827495b31725c7cd112360 Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Fri, 10 Apr 2009 20:07:37 +0000
Subject: [PATCH] JBPAPP-1073 : Annotations - Oracle - "size" is reserved in
 Oracle

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@16294 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 .../hibernate/test/annotations/inheritance/joined/Document.java | 2 +-
 .../hibernate/test/annotations/inheritance/union/Document.java  | 2 ++
 .../test/java/org/hibernate/test/annotations/query/Chaos.java   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java b/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java
index 849e3fb6e0..97fcd3bf80 100755
--- a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java
+++ b/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java
@@ -12,7 +12,7 @@ import org.hibernate.annotations.ForeignKey;
 @Entity
 @ForeignKey(name = "FK_DOCU_FILE")
 public class Document extends File {
-	@Column(nullable = false)
+	@Column(nullable = false, name="xsize")
 	private int size;
 
 	Document() {
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java b/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java
index 8576c9863a..751a64d32e 100755
--- a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java
+++ b/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java
@@ -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 @@ public class Document extends File {
 		this.size = size;
 	}
 
+	@Column(name="xsize")
 	public int getSize() {
 		return size;
 	}
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java b/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java
index f847848c39..8adfa0450d 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java
+++ b/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java
@@ -24,7 +24,7 @@ import org.hibernate.annotations.Loader;
 @Entity
 @Table(name="CHAOS")
 @SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, chaos_size, id) VALUES(upper(?),?,?,?)")
-@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, cha0s_size = ? WHERE id = ?")
+@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")