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

HHH-11329 fix tests using too long identifiers 

(cherry picked from commit a4cf282070)

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
	hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java
This commit is contained in:
Jan Martiska 2016-12-12 10:13:48 +01:00 committed by Gail Badner
parent 71c3a49572
commit 857298618c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
View File

@ -50,7 +50,7 @@ public class JoinedSubclassWithEmbeddableTest extends BaseCoreFunctionalTestCase
public void testSelectFromEmbeddedField() {
Session session = openSession();
session.getTransaction().begin();
session.createSQLQuery( "select * from employee_embeddable_person_map" ).list();
session.createSQLQuery( "select * from employee_emb_person_map" ).list();
session.getTransaction().commit();
session.close();
}
@ -145,20 +145,20 @@ public class JoinedSubclassWithEmbeddableTest extends BaseCoreFunctionalTestCase
public class EmployeeContact implements Serializable {
@ManyToOne
@JoinColumn(name = "employee_embeddable_alert_contact")
@JoinColumn(name = "employee_emb_alert_contact")
private Person alertContact;
@OneToMany
@JoinColumn(name = "employee_embeddable_alert_contact")
@JoinColumn(name = "employee_emb_alert_contact")
private Set<Employee> alerteeContacts = new HashSet<>();
@ManyToMany
@OrderColumn(name = "list_idx")
@JoinTable(name = "employee_embeddable_person_list")
@JoinTable(name = "employee_emb_person_list")
private List<Person> personList = new ArrayList<>();
@ManyToMany
@CollectionTable(name = "employee_embeddable_person_map")
@CollectionTable(name = "employee_emb_person_map")
@MapKeyColumn(name = "person_key", length = 20)
private Map<String, Person> personMap = new HashMap<>();
}

4
hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java
View File

@ -51,7 +51,7 @@ public class SingleTableWithEmbeddableTest extends BaseCoreFunctionalTestCase {
public void testSelectFromEmbeddedField() {
Session session = openSession();
session.getTransaction().begin();
session.createSQLQuery( "select * from employee_embeddable_person_map" ).list();
session.createSQLQuery( "select * from employee_emb_person_map" ).list();
session.getTransaction().commit();
session.close();
}
@ -159,7 +159,7 @@ public class SingleTableWithEmbeddableTest extends BaseCoreFunctionalTestCase {
private List<Person> personList = new ArrayList<>();
@ManyToMany
@CollectionTable(name = "employee_embeddable_person_map")
@CollectionTable(name = "employee_emb_person_map")
@MapKeyColumn(name = "person_key", length = 20)
private Map<String, Person> personMap = new HashMap<>();
}

2
hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java
View File

@ -158,7 +158,7 @@ public class TablePerClassWithEmbeddableTest extends BaseCoreFunctionalTestCase
private List<Person> personList = new ArrayList<>();
@ManyToMany
@CollectionTable(name = "employee_embeddable_person_map")
@CollectionTable(name = "employee_emb_person_map")
@MapKeyColumn(name = "person_key", length = 20)
private Map<String, Person> personMap = new HashMap<>();
}