HHH-9737 : Miscellaneous bugs in unit tests when using non-default dialects

(cherry picked from commit a6969ceb0a)
This commit is contained in:
Gail Badner 2015-04-21 12:12:59 -07:00
parent d2c50f16f2
commit 5269bcbeeb
4 changed files with 9 additions and 7 deletions

View File

@ -24,10 +24,10 @@ public class ExchangeRateKey
@Column(nullable = false) @Column(nullable = false)
protected long date; protected long date;
@javax.persistence.ManyToOne(fetch = FetchType.LAZY ) @javax.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false)
protected Currency currency1; protected Currency currency1;
@javax.persistence.ManyToOne(fetch = FetchType.LAZY ) @javax.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false)
protected Currency currency2; protected Currency currency2;

View File

@ -177,7 +177,7 @@ public class ElementCollectionTests extends BaseNonConfigCoreFunctionalTestCase
}) })
@ElementCollection(fetch = FetchType.LAZY) @ElementCollection(fetch = FetchType.LAZY)
@CollectionTable(name = "entity_map", joinColumns = @JoinColumn(name = "entity_id", nullable = false)) @CollectionTable(name = "entity_map", joinColumns = @JoinColumn(name = "entity_id", nullable = false))
@MapKeyColumn(name = "key", nullable = false) @MapKeyColumn(name = "`key`", nullable = false)
@Column(name = "value", nullable = false) @Column(name = "value", nullable = false)
public Map<ValueType, ValueType> map = new HashMap<ValueType, ValueType>(); public Map<ValueType, ValueType> map = new HashMap<ValueType, ValueType>();

View File

@ -32,10 +32,12 @@ import javax.persistence.FetchType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.JoinTable; import javax.persistence.JoinTable;
import javax.persistence.Table;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@Entity @Entity
@Table( name = "`User`" )
public class User { public class User {
private Long id; private Long id;
private Set<Role> roles = new HashSet<Role>(); private Set<Role> roles = new HashSet<Role>();

View File

@ -204,7 +204,7 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
@Entity @Entity
public static class CustomerOrder { public static class CustomerOrder {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue
public Long id; public Long id;
@OneToOne @OneToOne
@ -220,7 +220,7 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
@Entity @Entity
public static class Address { public static class Address {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue
public Long id; public Long id;
public String city; public String city;
@ -229,7 +229,7 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
@Entity @Entity
public static class OrderPosition { public static class OrderPosition {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue
public Long id; public Long id;
public Integer amount; public Integer amount;
@ -242,7 +242,7 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
@Entity @Entity
public static class Product { public static class Product {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue
public Long id; public Long id;
public String productName; public String productName;