Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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. 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@17527 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Hardy Ferentschik 2009-09-18 09:06:47 +00:00
parent 0a1763a207
commit b8da757937
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
annotations/src/test/java/org/hibernate/test/annotations/manytomany/Company.java
View File

@ -10,7 +10,8 @@ import javax.persistence.Column;
*/ */
@MappedSuperclass @MappedSuperclass
public class Company implements Serializable { public class Company implements Serializable {
@Column(unique = true) private String name; @Column
private String name;
public String getName() { public String getName() {
return name; return name;

11
annotations/src/test/java/org/hibernate/test/annotations/manytomany/Group.java
View File

@ -5,17 +5,14 @@ import java.util.Collection;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.OrderBy; import javax.persistence.OrderBy;
import javax.persistence.Table; 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.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.FilterJoinTable; import org.hibernate.annotations.FilterJoinTable;
import org.hibernate.annotations.Where;
import org.hibernate.annotations.WhereJoinTable; import org.hibernate.annotations.WhereJoinTable;
/** /**
@ -38,10 +35,6 @@ public class Group {
} }
@ManyToMany(cascade = CascadeType.PERSIST) @ManyToMany(cascade = CascadeType.PERSIST)
@JoinTable(name = "GROUPS_PERMISSIONS",
joinColumns = @JoinColumn(name = "group_id", referencedColumnName = "id"),
inverseJoinColumns = @JoinColumn(name = "permission", referencedColumnName = "permission")
)
@OrderBy("expirationDate") @OrderBy("expirationDate")
@Where(clause = "1=1") @Where(clause = "1=1")
@WhereJoinTable(clause = "2=2") @WhereJoinTable(clause = "2=2")

5
annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java
View File

@ -40,11 +40,6 @@ public class GroupWithSet {
} }
@ManyToMany(cascade = CascadeType.PERSIST) @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") @OrderBy("expirationDate")
@Where(clause = "1=1") @Where(clause = "1=1")
@WhereJoinTable(clause = "2=2") @WhereJoinTable(clause = "2=2")