Skip to content

Commit 97606e8

Browse files
committed
HHH-10036 - Fix identifier is too long exception for test EnhancerTest
1 parent a9daa65 commit 97606e8

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTestTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import javax.persistence.FetchType;
1212
import javax.persistence.GeneratedValue;
1313
import javax.persistence.Id;
14+
import javax.persistence.Table;
1415

1516
import org.hibernate.Hibernate;
1617
import org.hibernate.Session;
@@ -64,6 +65,7 @@ protected void cleanup() {
6465
}
6566

6667
@javax.persistence.Entity
68+
@Table(name = "lazy_field_not_init")
6769
public static class Entity {
6870
@Id
6971
@GeneratedValue

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTestTask.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import javax.persistence.FetchType;
1212
import javax.persistence.GeneratedValue;
1313
import javax.persistence.Id;
14+
import javax.persistence.Table;
1415

1516
import org.hibernate.Hibernate;
1617
import org.hibernate.Session;
@@ -19,6 +20,7 @@
1920

2021
import org.hibernate.test.bytecode.enhancement.AbstractEnhancerTestTask;
2122
import org.hibernate.test.bytecode.enhancement.EnhancerTestUtils;
23+
2224
import org.junit.Assert;
2325

2426
/**
@@ -113,6 +115,7 @@ protected void cleanup() {
113115
}
114116

115117
@javax.persistence.Entity
118+
@Table(name = "lazy_field_access")
116119
public static class Entity {
117120
private Long id;
118121

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTestTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import javax.persistence.FetchType;
1414
import javax.persistence.GeneratedValue;
1515
import javax.persistence.Id;
16+
import javax.persistence.Table;
1617

1718
import org.hibernate.Hibernate;
1819
import org.hibernate.Session;
@@ -116,6 +117,7 @@ protected void cleanup() {
116117

117118
@javax.persistence.Entity
118119
@Access(AccessType.FIELD )
120+
@Table(name="lazy_property_access")
119121
public static class Entity {
120122
@Id
121123
@GeneratedValue

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/CompositeMergeTestTask.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,25 @@
99
import java.util.Arrays;
1010
import java.util.List;
1111
import javax.persistence.Basic;
12+
import javax.persistence.CollectionTable;
13+
import javax.persistence.Column;
1214
import javax.persistence.ElementCollection;
1315
import javax.persistence.Embeddable;
1416
import javax.persistence.Embedded;
1517
import javax.persistence.Entity;
1618
import javax.persistence.FetchType;
1719
import javax.persistence.GeneratedValue;
1820
import javax.persistence.Id;
21+
import javax.persistence.JoinColumn;
22+
import javax.persistence.Table;
1923

2024
import org.hibernate.Session;
2125
import org.hibernate.cfg.Configuration;
2226
import org.hibernate.cfg.Environment;
2327

2428
import org.hibernate.test.bytecode.enhancement.AbstractEnhancerTestTask;
2529
import org.hibernate.test.bytecode.enhancement.EnhancerTestUtils;
30+
2631
import org.junit.Assert;
2732

2833
/**
@@ -33,7 +38,7 @@ public class CompositeMergeTestTask extends AbstractEnhancerTestTask {
3338
private long entityId;
3439

3540
public Class<?>[] getAnnotatedClasses() {
36-
return new Class<?>[] { ParentEntity.class, Address.class, Country.class };
41+
return new Class<?>[] {ParentEntity.class, Address.class, Country.class};
3742
}
3843

3944
public void prepare() {
@@ -110,6 +115,7 @@ protected void cleanup() {
110115
}
111116

112117
@Entity
118+
@Table(name = "parent_entity")
113119
private static class ParentEntity {
114120

115121
@Id
@@ -127,6 +133,7 @@ private static class ParentEntity {
127133
}
128134

129135
@Embeddable
136+
@Table(name = "address")
130137
private static class Address {
131138

132139
private String street;
@@ -137,11 +144,13 @@ private static class Address {
137144
}
138145

139146
@Embeddable
147+
@Table(name = "country")
140148
private static class Country {
141149

142150
private String name;
143151

144152
@ElementCollection
153+
@CollectionTable(name = "languages", joinColumns = @JoinColumn(name = "id", referencedColumnName = "id"))
145154
List<String> languages;
146155

147156
}

0 commit comments

Comments
 (0)