HHH-11601 - Fix tests failing on Oracle

This commit is contained in:
Vlad Mihalcea 2017-04-12 10:31:56 +03:00
parent 6a59994b64
commit 442bf225c4
6 changed files with 14 additions and 5 deletions

View File

@ -171,7 +171,9 @@ subprojects { subProject ->
if (db.equalsIgnoreCase("oracle")) { if (db.equalsIgnoreCase("oracle")) {
dependencies { dependencies {
testRuntime( libraries.oracle ) testRuntime( libraries.oracle ) {
exclude group: 'com.oracle.jdbc', module: 'xmlparserv2'
}
} }
} }
// 6.6 gave me some NPE problems from within checkstyle... // 6.6 gave me some NPE problems from within checkstyle...

View File

@ -73,7 +73,9 @@ dependencies {
if (db.equalsIgnoreCase("oracle")) { if (db.equalsIgnoreCase("oracle")) {
dependencies { dependencies {
testRuntime( libraries.oracle ) testRuntime( libraries.oracle ) {
exclude group: 'com.oracle.jdbc', module: 'xmlparserv2'
}
} }
} }

View File

@ -20,7 +20,9 @@ dependencies {
if (db.equalsIgnoreCase("oracle")) { if (db.equalsIgnoreCase("oracle")) {
dependencies { dependencies {
testRuntime( libraries.oracle ) testRuntime( libraries.oracle ) {
exclude group: 'com.oracle.jdbc', module: 'xmlparserv2'
}
} }
} }

View File

@ -47,7 +47,7 @@ public class PurchaseOrg implements Serializable {
} }
@ManyToMany(fetch = FetchType.LAZY) @ManyToMany(fetch = FetchType.LAZY)
@JoinTable(name = "purchase_organization_facilities", @JoinTable(name = "PURCHASE_FACILITY",
joinColumns = @JoinColumn(name = "PURCHASE_ORG_ID"), joinColumns = @JoinColumn(name = "PURCHASE_ORG_ID"),
inverseJoinColumns = @JoinColumn(name = "FACILITY_ID")) inverseJoinColumns = @JoinColumn(name = "FACILITY_ID"))
public List<Facility> getFacilities() { public List<Facility> getFacilities() {

View File

@ -86,7 +86,7 @@ public class LongListTypeContributorTest extends BaseEntityManagerFunctionalTest
@Column(length = 30) @Column(length = 30)
private String name; private String name;
@Column(columnDefinition = "text") @Column(columnDefinition = "VARCHAR(255)")
private LongList longList; private LongList longList;
public SpecialItem() { public SpecialItem() {

View File

@ -14,6 +14,8 @@ import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
@ -108,6 +110,7 @@ public class DeleteCollectionJtaSessionClosedBeforeCommitTest extends BaseEnvers
private String name; private String name;
@OneToMany @OneToMany
@JoinTable(name = "LINK_TABLE", joinColumns = @JoinColumn(name = "ENTITY_ID"))
private List<OtherTestEntity> others = new ArrayList<>(); private List<OtherTestEntity> others = new ArrayList<>();
public TestEntity() { public TestEntity() {