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

Author: sannegrinovero Date: 2010-04-11 07:39:28 -0400 (Sun, 11 Apr 2010) New Revision: 19210 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-11 11:17:29 UTC (rev 19209) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java 2010-04-11 11:39:28 UTC (rev 19210) @@ -1,6 +1,8 @@ package org.hibernate.search.test.embedded.nested.containedIn; import java.io.Serializable; + +import javax.persistence.Column; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -32,6 +34,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-11 11:17:29 UTC (rev 19209) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForUnindexed.java 2010-04-11 11:39:28 UTC (rev 19210) @@ -1,10 +1,10 @@ package org.hibernate.search.test.embedded.nested.containedIn; import java.io.Serializable; + +import javax.persistence.Column; import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.SequenceGenerator; import javax.persistence.Version; import org.hibernate.search.annotations.Field; @@ -36,11 +36,7 @@ @org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.READ_WRITE) private java.util.List<Entity2ForUnindexed> entities2 = new java.util.ArrayList<Entity2ForUnindexed>(); - /** - * Getter de l'attribut uid - * - * @return long : Renvoie uid. - */ + @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-11 11:17:29 UTC (rev 19209) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForDoc0.java 2010-04-11 11:39:28 UTC (rev 19210) @@ -1,20 +1,17 @@ package org.hibernate.search.test.embedded.nested.containedIn; import javax.persistence.Basic; +import javax.persistence.Column; import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.SequenceGenerator; import javax.persistence.Version; /** * @author grolland - * */ @javax.persistence.Entity @org.hibernate.annotations.Proxy(lazy = true) @javax.persistence.Table(name = "entity2") -// @SequenceGenerator( name="ids_generator2", sequenceName = "ids_generator2") public class Entity2ForDoc0 { private static final long serialVersionUID = -3191273589083411349L; @@ -41,6 +38,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-11 11:17:29 UTC (rev 19209) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForUnindexed.java 2010-04-11 11:39:28 UTC (rev 19210) @@ -1,9 +1,8 @@ package org.hibernate.search.test.embedded.nested.containedIn; +import javax.persistence.Column; import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.SequenceGenerator; import javax.persistence.Version; /** @@ -45,6 +44,7 @@ * * @return long : Renvoie uid. */ + @Column(name="universalid")//"uid" is a keywork in Oracle public long getUid() { return uid; }