HHH-10457 fix derived identity tests

Author: jmartisk

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Dependent.java

@@ -17,8 +17,8 @@ public class Dependent {
 
 	@Id @ManyToOne
 	@JoinColumns({
-			@JoinColumn(name="FK1", referencedColumnName="firstName"),
-			@JoinColumn(name="FK2", referencedColumnName="lastName")
+			@JoinColumn(name="FK1", referencedColumnName="firstName", nullable = false),
+			@JoinColumn(name="FK2", referencedColumnName="lastName", nullable = false)
 	})
 	Employee emp;
 }

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Dependent.java

@@ -19,8 +19,8 @@ public class Dependent {
 
 	@Id
 	@JoinColumns({
-			@JoinColumn(name = "FK1", referencedColumnName = "firstName"),
-			@JoinColumn(name = "FK2", referencedColumnName = "lastName")
+			@JoinColumn(name = "FK1", referencedColumnName = "firstName", nullable = false),
+			@JoinColumn(name = "FK2", referencedColumnName = "lastName", nullable = false)
 	})
 	@ManyToOne
 	Employee emp;

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Dependent.java

@@ -21,8 +21,8 @@ public class Dependent {
 
 	@MapsId("empPK")
 	@JoinColumns({
-			@JoinColumn(name = "FK1", referencedColumnName = "FIRSTNAME"),
-			@JoinColumn(name = "FK2", referencedColumnName = "lastName")
+			@JoinColumn(name = "FK1", referencedColumnName = "FIRSTNAME", nullable = false),
+			@JoinColumn(name = "FK2", referencedColumnName = "lastName", nullable = false)
 	})
 	@ManyToOne
 	Employee emp;

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Dependent.java

@@ -2,6 +2,8 @@
 
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
 import javax.persistence.ManyToOne;
 import javax.persistence.MapsId;
 
@@ -13,5 +15,6 @@ public class Dependent {
 
 	@MapsId("empPK")
 	@ManyToOne
+	@JoinColumns( { @JoinColumn(nullable = false), @JoinColumn(nullable = false) })
 	Employee emp;
 }

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/EmployeeId.java

@@ -1,10 +1,12 @@
 package org.hibernate.test.annotations.derivedidentities.e3.b2;
 
-import javax.persistence.Embeddable;
 import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class EmployeeId implements Serializable {
-	String firstName;
-	String lastName;
+    @Column(length = 80) // for some reason db2 complains about too large PK if this is set to default (255)
+    String firstName;
+    String lastName;
 }

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Policy.java

@@ -2,6 +2,8 @@
 
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
 import javax.persistence.ManyToOne;
 import javax.persistence.MapsId;
 
@@ -13,6 +15,7 @@ public class Policy {
 
 	@MapsId("depPK")
 	@ManyToOne
+	@JoinColumns( { @JoinColumn(nullable = false), @JoinColumn(nullable = false), @JoinColumn(nullable = false) })
 	Dependent dep;
 
 }

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/PolicyId.java

@@ -1,10 +1,12 @@
 package org.hibernate.test.annotations.derivedidentities.e3.b2;
 
-import javax.persistence.Embeddable;
 import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class PolicyId implements Serializable {
+	@Column(length = 80)  // for some reason db2 complains about too large PK if this is set to default (255)
 	String type;
 	DependentId depPK;
 }

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Dependent.java

@@ -9,8 +9,8 @@ public class Dependent {
 	DependentId id;
 
 	@JoinColumns({
-			@JoinColumn(name = "FIRSTNAME", referencedColumnName = "FIRSTNAME"),
-			@JoinColumn(name = "LASTNAME", referencedColumnName = "lastName")
+			@JoinColumn(name = "FIRSTNAME", referencedColumnName = "FIRSTNAME", nullable = false),
+			@JoinColumn(name = "LASTNAME", referencedColumnName = "lastName", nullable = false)
 	})
 	@MapsId("empPK")
 	@ManyToOne

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/EmployeeId.java

@@ -1,10 +1,12 @@
 package org.hibernate.test.annotations.derivedidentities.e3.b3;
 
+import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable
 public class EmployeeId implements Serializable {
+	@Column(length = 80) // for some reason db2 complains about too large PK if this is set to default (255)
 	String firstName;
 	String lastName;
 }

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Policy.java

@@ -8,9 +8,9 @@ public class Policy {
 	PolicyId id;
 
 	@JoinColumns({
-			@JoinColumn(name = "FIRSTNAME", referencedColumnName = "FIRSTNAME"),
-			@JoinColumn(name = "LASTNAME", referencedColumnName = "lastName"),
-			@JoinColumn(name = "NAME", referencedColumnName = "Name")
+			@JoinColumn(name = "FIRSTNAME", referencedColumnName = "FIRSTNAME", nullable = false),
+			@JoinColumn(name = "LASTNAME", referencedColumnName = "lastName", nullable = false),
+			@JoinColumn(name = "NAME", referencedColumnName = "Name", nullable = false)
 	})
 	@MapsId("depPK")
 	@ManyToOne