HHH-12320 HHH-12975 - Added test cases.

(cherry picked from commit 9022085f5c)

hibernate-core/src/test/java/org/hibernate/test/constraint/ForeignKeyConstraintMapsIdTest.java

@@ -0,0 +1,107 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.constraint;
+
+import java.util.Iterator;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.ForeignKey;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.MapsId;
+import javax.persistence.OneToOne;
+
+import org.hibernate.boot.model.relational.Namespace;
+import org.hibernate.mapping.Table;
+import org.junit.Test;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * @author Chris Cranford
+ */
+@TestForIssue(jiraKey = "HHH-12320")
+public class ForeignKeyConstraintMapsIdTest extends BaseNonConfigCoreFunctionalTestCase {
+	@Entity(name = "Post")
+	public static class Post {
+		@Id
+		private Integer id;
+
+		@OneToOne(fetch = FetchType.LAZY)
+		@MapsId
+		@JoinColumn(name = "PD_ID", foreignKey = @ForeignKey(name = "FK_PD"))
+		private PostDetails postDetails;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public PostDetails getPostDetails() {
+			return postDetails;
+		}
+
+		public void setPostDetails(PostDetails postDetails) {
+			this.postDetails = postDetails;
+		}
+	}
+
+	@Entity(name = "PostDetails")
+	public static class PostDetails {
+		@Id
+		private Integer id;
+		private String userName;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getUserName() {
+			return userName;
+		}
+
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+	}
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] { Post.class, PostDetails.class };
+	}
+
+	@Test
+	public void testForeignKeyNameSetForMapsIdJoinColumn() {
+		for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) {
+			for ( Table table : namespace.getTables() ) {
+				if ( table.getName().equals( "Post" ) ) {
+					Iterator<org.hibernate.mapping.ForeignKey> foreignKeyIterator = table.getForeignKeyIterator();
+					while ( foreignKeyIterator.hasNext() ) {
+						org.hibernate.mapping.ForeignKey foreignKey = foreignKeyIterator.next();
+						if ( foreignKey.getColumn( 0 ).getName().equals( "PD_ID" ) ) {
+							assertEquals( "FK_PD", foreignKey.getName() );
+							return;
+						}
+					}
+				}
+			}
+		}
+		fail( "Expected to find a Foreign Key mapped to column PD_ID but failed to locate it" );
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/constraint/ForeignKeyNoConstraintTest.java

@@ -0,0 +1,165 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.constraint;
+
+import javax.persistence.ConstraintMode;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.ForeignKey;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.MapsId;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+
+import org.hibernate.boot.model.relational.Namespace;
+import org.hibernate.mapping.Table;
+import org.junit.Test;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Chris Cranford
+ */
+public class ForeignKeyNoConstraintTest extends BaseNonConfigCoreFunctionalTestCase {
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class<?>[] {
+				Car.class,
+				VehicleNumber.class,
+				Post.class,
+				PostDetails.class
+		};
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-12975")
+	public void testPrimaryKeyJoinColumnForeignKeyNoConstraint() {
+		for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) {
+			for ( Table table : namespace.getTables() ) {
+				if ( "Car".equals( table.getName() ) ) {
+					assertEquals( 0, table.getForeignKeys().size() );
+				}
+			}
+		}
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-12975")
+	public void testMapsIdJoinColumnForeignKeyNoConstraint() {
+		for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) {
+			for ( Table table : namespace.getTables() ) {
+				if ( "Post".equals( table.getName() ) ) {
+					assertEquals( 0, table.getForeignKeys().size() );
+				}
+			}
+		}
+	}
+
+	@Entity(name = "Car")
+	public static class Car {
+		@Id
+		private Integer id;
+
+		@PrimaryKeyJoinColumn
+		@OneToOne(optional = false)
+		@JoinColumn(name = "V_ID", foreignKey = @ForeignKey( ConstraintMode.NO_CONSTRAINT ) )
+		private VehicleNumber vehicleNumber;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public VehicleNumber getVehicleNumber() {
+			return vehicleNumber;
+		}
+
+		public void setVehicleNumber(VehicleNumber vehicleNumber) {
+			this.vehicleNumber = vehicleNumber;
+		}
+	}
+
+	@Entity(name = "VehicleNumber")
+	public static class VehicleNumber {
+		@Id
+		private Integer id;
+		private String value;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+	}
+
+	@Entity(name = "Post")
+	public static class Post {
+		@Id
+		private Integer id;
+
+		@OneToOne(fetch = FetchType.LAZY)
+		@MapsId
+		@JoinColumn(name = "PD_ID", foreignKey = @ForeignKey(name = "FK_PD", value = ConstraintMode.NO_CONSTRAINT))
+		private PostDetails postDetails;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public PostDetails getPostDetails() {
+			return postDetails;
+		}
+
+		public void setPostDetails(PostDetails postDetails) {
+			this.postDetails = postDetails;
+		}
+	}
+
+	@Entity(name = "PostDetails")
+	public static class PostDetails {
+		@Id
+		private Integer id;
+		private String userName;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getUserName() {
+			return userName;
+		}
+
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+	}
+}