[hibernate-commits] Hibernate SVN: r19268 - search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-04-21 09:57:59 -0400 (Wed, 21 Apr 2010)
New Revision: 19268

Modified:
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForUnindexed.java
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForDoc0.java
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForUnindexed.java
Log:
HSEARCH-504 Fix ContainedIn tests which break on Oracle as they use a reserved keyword as column name

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java	2010-04-21 13:37:39 UTC (rev 19267)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java	2010-04-21 13:57:59 UTC (rev 19268)
@@ -25,6 +25,7 @@
 
 	@Id
 	@GeneratedValue //(generator = "ids_generator1", strategy = GenerationType.SEQUENCE)
+	@Column(name="universalid")//"uid" is a keywork in Oracle
 	private long uid;
 
 	@Version
@@ -34,7 +35,7 @@
 	@org.hibernate.search.annotations.IndexedEmbedded
 	private java.util.List<Entity2ForDoc0> entities2 = new java.util.ArrayList<Entity2ForDoc0>();
 
-	@Column(name="universalid")//"uid" is a keywork in Oracle
+	
 	public long getUid() {
 		return uid;
 	}

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForUnindexed.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForUnindexed.java	2010-04-21 13:37:39 UTC (rev 19267)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForUnindexed.java	2010-04-21 13:57:59 UTC (rev 19268)
@@ -26,6 +26,7 @@
 	@Id
 	@GeneratedValue
 	@Field(index = Index.UN_TOKENIZED)
+	@Column(name="universalid")
 	private long uid;
 
 	@Version
@@ -36,7 +37,7 @@
 	@org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.READ_WRITE)
 	private java.util.List<Entity2ForUnindexed> entities2 = new java.util.ArrayList<Entity2ForUnindexed>();
 
-	@Column(name="universalid")
+	
 	public long getUid() {
 		return uid;
 	}

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForDoc0.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForDoc0.java	2010-04-21 13:37:39 UTC (rev 19267)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForDoc0.java	2010-04-21 13:57:59 UTC (rev 19268)
@@ -18,6 +18,7 @@
 
 	@Id
 	@GeneratedValue //(generator = "ids_generator2", strategy = GenerationType.SEQUENCE)
+	@Column(name="universalid")//"uid" is a keywork in Oracle
 	private long uid;
 
 	@Version
@@ -38,7 +39,7 @@
 		this.name = name;
 	}
 
-	@Column(name="universalid")//"uid" is a keywork in Oracle
+	
 	public long getUid() {
 		return uid;
 	}

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForUnindexed.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForUnindexed.java	2010-04-21 13:37:39 UTC (rev 19267)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForUnindexed.java	2010-04-21 13:57:59 UTC (rev 19268)
@@ -26,6 +26,7 @@
 	 */
 	@Id
 	@GeneratedValue
+	@Column(name="universalid")//"uid" is a keywork in Oracle
 	private long uid;
 
 	/**
@@ -44,7 +45,7 @@
 	 *
 	 * @return long : Renvoie uid.
 	 */
-	@Column(name="universalid")//"uid" is a keywork in Oracle
+	
 	public long getUid() {
 		return uid;
 	}