[hibernate-commits] Hibernate SVN: r17527 - core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-09-18 05:06:47 -0400 (Fri, 18 Sep 2009)
New Revision: 17527

Modified:
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Company.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Group.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java
Log:
JBPAPP-1075 - Removed the @JoinColumn mappings. Thought not wrong per se they cause some wrong table creation scripts. Removing them circumvents this problem without affecting the test.

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Company.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Company.java	2009-09-17 21:26:25 UTC (rev 17526)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Company.java	2009-09-18 09:06:47 UTC (rev 17527)
@@ -10,7 +10,8 @@
  */
 @MappedSuperclass
 public class Company implements Serializable {
-	@Column(unique = true) private String name;
+	@Column
+	private String name;
 
 	public String getName() {
 		return name;

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Group.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Group.java	2009-09-17 21:26:25 UTC (rev 17526)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Group.java	2009-09-18 09:06:47 UTC (rev 17527)
@@ -5,17 +5,14 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OrderBy;
 import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
 
-import org.hibernate.annotations.Where;
-import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.Filter;
+import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.FilterJoinTable;
+import org.hibernate.annotations.Where;
 import org.hibernate.annotations.WhereJoinTable;
 
 /**
@@ -38,10 +35,6 @@
 	}
 
 	@ManyToMany(cascade = CascadeType.PERSIST)
-	@JoinTable(name = "GROUPS_PERMISSIONS",
-			joinColumns = @JoinColumn(name = "group_id", referencedColumnName = "id"),
-			inverseJoinColumns = @JoinColumn(name = "permission", referencedColumnName = "permission")
-	)
 	@OrderBy("expirationDate")
 	@Where(clause = "1=1")
 	@WhereJoinTable(clause = "2=2")

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java	2009-09-17 21:26:25 UTC (rev 17526)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java	2009-09-18 09:06:47 UTC (rev 17527)
@@ -40,11 +40,6 @@
 	}
 
 	@ManyToMany(cascade = CascadeType.PERSIST)
-	@JoinTable(name = "GROUPS_PERMISSIONS",
-			uniqueConstraints = @UniqueConstraint(columnNames = {"group_id", "permission"}),
-			joinColumns = @JoinColumn(name = "group_id", referencedColumnName = "id"),
-			inverseJoinColumns = @JoinColumn(name = "permission", referencedColumnName = "permission")
-	)
 	@OrderBy("expirationDate")
 	@Where(clause = "1=1")
 	@WhereJoinTable(clause = "2=2")