From 857298618c6e640f8466c6d778a78f4ec4599b9d Mon Sep 17 00:00:00 2001 From: Jan Martiska Date: Mon, 12 Dec 2016 10:13:48 +0100 Subject: [PATCH] HHH-11329 fix tests using too long identifiers (cherry picked from commit a4cf28207073469a5bfc14f7202ae5036cf93024) 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 --- .../embeddable/JoinedSubclassWithEmbeddableTest.java | 10 +++++----- .../embeddable/SingleTableWithEmbeddableTest.java | 4 ++-- .../embeddable/TablePerClassWithEmbeddableTest.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java index a3e0a279ed..a5fa9b367b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java @@ -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 alerteeContacts = new HashSet<>(); @ManyToMany @OrderColumn(name = "list_idx") - @JoinTable(name = "employee_embeddable_person_list") + @JoinTable(name = "employee_emb_person_list") private List personList = new ArrayList<>(); @ManyToMany - @CollectionTable(name = "employee_embeddable_person_map") + @CollectionTable(name = "employee_emb_person_map") @MapKeyColumn(name = "person_key", length = 20) private Map personMap = new HashMap<>(); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java index b483c3ab81..4a1e5ec85e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java @@ -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 personList = new ArrayList<>(); @ManyToMany - @CollectionTable(name = "employee_embeddable_person_map") + @CollectionTable(name = "employee_emb_person_map") @MapKeyColumn(name = "person_key", length = 20) private Map personMap = new HashMap<>(); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java index 864d7da201..c64e93fe81 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java @@ -158,7 +158,7 @@ public class TablePerClassWithEmbeddableTest extends BaseCoreFunctionalTestCase private List personList = new ArrayList<>(); @ManyToMany - @CollectionTable(name = "employee_embeddable_person_map") + @CollectionTable(name = "employee_emb_person_map") @MapKeyColumn(name = "person_key", length = 20) private Map personMap = new HashMap<>(); }