From b9e8d71dc875d7450d7ea895c8a31212810fdf62 Mon Sep 17 00:00:00 2001
From: Marco Belladelli <marco@hibernate.org>
Date: Tue, 4 Jul 2023 14:19:15 +0200
Subject: [PATCH] HHH-16849 HHH-16942 Add test for issue

---
 .../PartitionKeyAndAssociationTest.java       | 137 ++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java
new file mode 100644
index 0000000000..15684ad3fd
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java
@@ -0,0 +1,137 @@
+/*
+ * 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.orm.test.sql.partition;
+
+import org.hibernate.annotations.PartitionKey;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Marco Belladelli
+ */
+@SessionFactory
+@DomainModel( annotatedClasses = {
+		PartitionKeyAndAssociationTest.SalesContact.class,
+		PartitionKeyAndAssociationTest.ContactEmail.class,
+		PartitionKeyAndAssociationTest.ContactAddress.class,
+} )
+@Jira( "https://hibernate.atlassian.net/browse/HHH-16849" )
+@Jira( "https://hibernate.atlassian.net/browse/HHH-16942" )
+public class PartitionKeyAndAssociationTest {
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.persist( new SalesContact( 1L, 1L, "name_1" ) );
+			session.persist( new SalesContact( 2L, 2L, "name_2" ) );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery( "delete from SalesContact" ).executeUpdate() );
+	}
+
+	@Test
+	public void testUpdate(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SalesContact contact = session.find( SalesContact.class, 1L );
+			contact.setName( "updated_name" );
+		} );
+		scope.inTransaction( session -> assertThat( session.find(
+				SalesContact.class,
+				1L
+		).getName() ).isEqualTo( "updated_name" ) );
+	}
+
+	@Test
+	public void testDelete(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SalesContact contact = session.find( SalesContact.class, 2L );
+			session.remove( contact );
+		} );
+		scope.inTransaction( session -> assertThat( session.find(
+				SalesContact.class,
+				2L
+		) ).isNull() );
+	}
+
+	@Entity( name = "SalesContact" )
+	public static class SalesContact {
+		@Id
+		private Long id;
+
+		@PartitionKey
+		private Long accountId;
+
+		@OneToOne( mappedBy = "contact", cascade = CascadeType.ALL )
+		private ContactAddress contactAddress;
+
+		private String name;
+
+		public SalesContact() {
+		}
+
+		public SalesContact(Long id, Long accountId, String name) {
+			this.id = id;
+			this.accountId = accountId;
+			this.name = name;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	@Entity( name = "ContactEmail" )
+	public static class ContactEmail {
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String email;
+
+		@ManyToOne( fetch = FetchType.LAZY )
+		@JoinColumn( name = "account_id", referencedColumnName = "accountId", nullable = false )
+		@JoinColumn( name = "contact_id", referencedColumnName = "id", nullable = false )
+		private SalesContact contact;
+	}
+
+	@Entity( name = "ContactAddress" )
+	public static class ContactAddress {
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String address;
+
+		@OneToOne( fetch = FetchType.LAZY )
+		@JoinColumn( name = "account_id", referencedColumnName = "accountId", nullable = false )
+		@JoinColumn( name = "contact_id", referencedColumnName = "id", nullable = false )
+		private SalesContact contact;
+	}
+}