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

HHH-9390 : Default join column name (FK) for @ManyToMany uses owning entity primary table name (test cases) 

(cherry picked from commit d4d5fcc9e2)
This commit is contained in:
Gail Badner 2014-09-11 12:49:44 -07:00
parent e4b0915a8e
commit f8af94e559
9 changed files with 16 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Category.java
View File

@ -30,8 +30,6 @@ import javax.persistence.Id;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.Table; import javax.persistence.Table;
import org.hibernate.test.annotations.manytomany.KnownClient;
/** /**
* @author Gail Badner * @author Gail Badner
*/ */

2
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/City.java
View File

@ -7,8 +7,6 @@ import javax.persistence.Id;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.Table; import javax.persistence.Table;
import org.hibernate.test.annotations.manytomany.Item;
/** /**
* @author Emmanuel Bernard * @author Emmanuel Bernard
*/ */

6
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ContactInfo.java
View File

@ -4,17 +4,15 @@ import javax.persistence.CascadeType;
import javax.persistence.Embeddable; import javax.persistence.Embeddable;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import org.hibernate.test.annotations.manytomany.PhoneNumber;
@Embeddable @Embeddable
public class ContactInfo { public class ContactInfo {
// @ManyToOne // @ManyToOne
// Address address; // Unidirectional // Address address; // Unidirectional
List<org.hibernate.test.annotations.manytomany.PhoneNumber> phoneNumbers; // Bidirectional List<PhoneNumber> phoneNumbers; // Bidirectional
@ManyToMany(cascade= CascadeType.ALL) @ManyToMany(cascade= CascadeType.ALL)
public List<org.hibernate.test.annotations.manytomany.PhoneNumber> getPhoneNumbers() { public List<PhoneNumber> getPhoneNumbers() {
return phoneNumbers; return phoneNumbers;
} }

30
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Employee.java
View File

@ -13,9 +13,6 @@ import javax.persistence.InheritanceType;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import org.hibernate.annotations.Cascade; import org.hibernate.annotations.Cascade;
import org.hibernate.test.annotations.manytomany.ContactInfo;
import org.hibernate.test.annotations.manytomany.Employer;
import org.hibernate.test.annotations.manytomany.JobInfo;
/** /**
* Employee in an Employer-Employee relationship * Employee in an Employer-Employee relationship
@ -27,10 +24,8 @@ import org.hibernate.test.annotations.manytomany.JobInfo;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class Employee implements Serializable { public class Employee implements Serializable {
private Integer id; private Integer id;
private Collection<Employer> employers;
private String name; private String name;
ContactInfo contactInfo; ContactInfo contactInfo;
JobInfo jobInfo;
// ContactInfo is for ManyToMany testing // ContactInfo is for ManyToMany testing
@Embedded @Embedded
@ -42,17 +37,6 @@ public class Employee implements Serializable {
this.contactInfo = contactInfo; this.contactInfo = contactInfo;
} }
// JobInfo is for OneToMany testing
@Embedded
public JobInfo getJobInfo() {
return jobInfo;
}
public void setJobInfo(JobInfo jobInfo) {
this.jobInfo = jobInfo;
}
@Column(name="fld_name") @Column(name="fld_name")
public String getName() { public String getName() {
return name; return name;
@ -71,18 +55,4 @@ public class Employee implements Serializable {
public void setId(Integer integer) { public void setId(Integer integer) {
id = integer; id = integer;
} }
@ManyToMany(
cascade = {CascadeType.PERSIST, CascadeType.MERGE},
mappedBy = "employees"
)
@Cascade({org.hibernate.annotations.CascadeType.SAVE_UPDATE,
org.hibernate.annotations.CascadeType.PERSIST})
public Collection<Employer> getEmployers() {
return employers;
}
public void setEmployers(Collection<Employer> employers) {
this.employers = employers;
}
} }

8
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Item.java
View File

@ -30,15 +30,13 @@ import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import org.hibernate.test.annotations.manytomany.*;
/** /**
* @author Gail Badner * @author Gail Badner
*/ */
@Entity(name="ITEM") @Entity(name="ITEM")
public class Item { public class Item {
private Integer id; private Integer id;
private Set<org.hibernate.test.annotations.manytomany.City> producedInCities; private Set<City> producedInCities;
@Id @Id
@GeneratedValue @GeneratedValue
@ -52,11 +50,11 @@ public class Item {
} }
@ManyToMany @ManyToMany
public Set<org.hibernate.test.annotations.manytomany.City> getProducedInCities() { public Set<City> getProducedInCities() {
return producedInCities; return producedInCities;
} }
public void setProducedInCities(Set<org.hibernate.test.annotations.manytomany.City> producedInCities) { public void setProducedInCities(Set<City> producedInCities) {
this.producedInCities = producedInCities; this.producedInCities = producedInCities;
} }
} }

2
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/KnownClient.java
View File

@ -6,8 +6,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import org.hibernate.test.annotations.manytomany.Store;
/** /**
* @author Emmanuel Bernard * @author Emmanuel Bernard
*/ */

21
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ManyToManyDefaultsTest.java
View File

@ -29,17 +29,8 @@ import org.junit.Test;
import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.ForeignKey;
import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.PersistentClass;
import org.hibernate.test.annotations.manytomany.Category; import org.hibernate.testing.FailureExpected;
import org.hibernate.test.annotations.manytomany.City; import org.hibernate.testing.TestForIssue;
import org.hibernate.test.annotations.manytomany.Contractor;
import org.hibernate.test.annotations.manytomany.Employee;
import org.hibernate.test.annotations.manytomany.Employer;
import org.hibernate.test.annotations.manytomany.Item;
import org.hibernate.test.annotations.manytomany.KnownClient;
import org.hibernate.test.annotations.manytomany.PhoneNumber;
import org.hibernate.test.annotations.manytomany.ProgramManager;
import org.hibernate.test.annotations.manytomany.Store;
import org.hibernate.test.annotations.manytomany.Supplier;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.type.EntityType; import org.hibernate.type.EntityType;
@ -168,6 +159,8 @@ public class ManyToManyDefaultsTest extends BaseCoreFunctionalTestCase {
} }
@Test @Test
@TestForIssue( jiraKey = "HHH-9390")
@FailureExpected( jiraKey = "HHH-9390")
public void testUnidirOwnerPrimaryTableAssocEntityNamePKOverride() { public void testUnidirOwnerPrimaryTableAssocEntityNamePKOverride() {
// City.stolenItems; associated entity: Item // City.stolenItems; associated entity: Item
// City has @Entity with no name configured and @Table(name = "tbl_city") // City has @Entity with no name configured and @Table(name = "tbl_city")
@ -186,6 +179,8 @@ public class ManyToManyDefaultsTest extends BaseCoreFunctionalTestCase {
} }
@Test @Test
@TestForIssue( jiraKey = "HHH-9390")
@FailureExpected( jiraKey = "HHH-9390")
public void testUnidirOwnerEntityNamePrimaryTableOverride() { public void testUnidirOwnerEntityNamePrimaryTableOverride() {
// Category.clients: associated entity: KnownClient // Category.clients: associated entity: KnownClient
// Category has @Entity(name="CATEGORY") @Table(name="CATEGORY_TAB") // Category has @Entity(name="CATEGORY") @Table(name="CATEGORY_TAB")
@ -261,15 +256,11 @@ public class ManyToManyDefaultsTest extends BaseCoreFunctionalTestCase {
return new Class[]{ return new Class[]{
Category.class, Category.class,
City.class, City.class,
Contractor.class,
Employee.class, Employee.class,
Employer.class,
Item.class, Item.class,
KnownClient.class, KnownClient.class,
PhoneNumber.class, PhoneNumber.class,
ProgramManager.class,
Store.class, Store.class,
Supplier.class
}; };
} }
} }

6
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/PhoneNumber.java
View File

@ -5,12 +5,10 @@ import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import org.hibernate.test.annotations.manytomany.Employee;
@Entity @Entity
public class PhoneNumber { public class PhoneNumber {
int phNumber; int phNumber;
Collection<org.hibernate.test.annotations.manytomany.Employee> employees; Collection<Employee> employees;
@Id @Id
public int getPhNumber() { public int getPhNumber() {
@ -22,7 +20,7 @@ public class PhoneNumber {
} }
@ManyToMany(mappedBy="contactInfo.phoneNumbers", cascade= CascadeType.ALL) @ManyToMany(mappedBy="contactInfo.phoneNumbers", cascade= CascadeType.ALL)
public Collection<org.hibernate.test.annotations.manytomany.Employee> getEmployees() { public Collection<Employee> getEmployees() {
return employees; return employees;
} }

24
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Store.java
View File

@ -1,5 +1,6 @@
//$Id$ //$Id$
package org.hibernate.test.annotations.manytomany.defaults; package org.hibernate.test.annotations.manytomany.defaults;
import java.util.Set; import java.util.Set;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
@ -10,10 +11,6 @@ import javax.persistence.JoinColumn;
import javax.persistence.JoinTable; import javax.persistence.JoinTable;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import org.hibernate.test.annotations.manytomany.*;
import org.hibernate.test.annotations.manytomany.City;
import org.hibernate.test.annotations.manytomany.KnownClient;
/** /**
* @author Emmanuel Bernard * @author Emmanuel Bernard
*/ */
@ -22,35 +19,20 @@ public class Store {
private Integer id; private Integer id;
private String name; private String name;
private Set<KnownClient> customers; private Set<KnownClient> customers;
private Set<Supplier> suppliers;
private Set<Item> items; private Set<Item> items;
private Set<Category> categories; private Set<Category> categories;
@ManyToMany(cascade = CascadeType.PERSIST) @ManyToMany(cascade = CascadeType.PERSIST)
public Set<org.hibernate.test.annotations.manytomany.City> getImplantedIn() { public Set<City> getImplantedIn() {
return implantedIn; return implantedIn;
} }
public void setImplantedIn(Set<org.hibernate.test.annotations.manytomany.City> implantedIn) { public void setImplantedIn(Set<City> implantedIn) {
this.implantedIn = implantedIn; this.implantedIn = implantedIn;
} }
private Set<City> implantedIn; private Set<City> implantedIn;
@ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
@JoinTable(
name = "StoreSupplier",
joinColumns = @JoinColumn(name = "store"),
inverseJoinColumns = @JoinColumn(name = "supplier")
)
public Set<Supplier> getSuppliers() {
return suppliers;
}
public void setSuppliers(Set<Supplier> suppliers) {
this.suppliers = suppliers;
}
@Id @Id
@GeneratedValue @GeneratedValue
@Column(name="sId") @Column(name="sId")