HHH-19555 add tests showing things actually working nicely

Author: gavinking

hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java

@@ -420,7 +420,7 @@ INSERT INTO employees (id, name, salary, version)
 				salary = values(salary)
 	*/
 	@Override
-	protected void renderUpdatevalue(ColumnValueBinding columnValueBinding) {
+	protected void renderUpdateValue(ColumnValueBinding columnValueBinding) {
 		appendSql( "values(" );
 		appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
 		appendSql( ")" );

hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java

@@ -454,7 +454,7 @@ protected void renderNewRowAlias() {
 	}
 
 	@Override
-	protected void renderUpdatevalue(ColumnValueBinding columnValueBinding) {
+	protected void renderUpdateValue(ColumnValueBinding columnValueBinding) {
 		renderAlias();
 		appendSql( "." );
 		appendSql( columnValueBinding.getColumnReference().getColumnExpression() );

hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SqlAstTranslatorWithOnDuplicateKeyUpdate.java

@@ -102,11 +102,11 @@ protected void renderOnDuplicateKeyUpdate(OptionalTableUpdate optionalTableUpdat
 			}
 			appendSql( columnName );
 			append( " = " );
-			renderUpdatevalue( columnValueBinding );
+			renderUpdateValue( columnValueBinding );
 		} );
 	}
 
-	protected void renderUpdatevalue(ColumnValueBinding columnValueBinding) {
+	protected void renderUpdateValue(ColumnValueBinding columnValueBinding) {
 	}
 
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/ManyToOneImplicitJoinTableRestrictionTest.java

@@ -0,0 +1,91 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.manytoone.jointable;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import org.hibernate.annotations.SQLRestriction;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@Jpa(annotatedClasses =
+		{ManyToOneImplicitJoinTableRestrictionTest.X.class,
+		ManyToOneImplicitJoinTableRestrictionTest.Y.class})
+class ManyToOneImplicitJoinTableRestrictionTest {
+	@JiraKey("HHH-19555") @Test
+	void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( s -> {
+			X x = new X();
+			Y y = new Y();
+			x.id = -1;
+			y.x = x;
+			s.persist( x );
+			s.persist( y );
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			y.name = "Gavin";
+			assertNull(y.x);
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			assertEquals("Gavin", y.name);
+			assertNull(y.x);
+			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResult();
+			assertEquals( -1L, id );
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			X x = new X();
+			x.id = 1;
+			s.persist( x );
+			y.x = x;
+			// uses a SQL merge to update the join table
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			assertEquals("Gavin", y.name);
+			assertNotNull(y.x);
+			assertEquals( 1L, y.x.id );
+			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResult();
+			assertEquals( 1L, id );
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			y.x = null;
+			// uses a SQL merge to update the join table
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			assertEquals("Gavin", y.name);
+			assertNull(y.x);
+			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResultOrNull();
+			assertNull( id );
+		} );
+	}
+
+	@Entity(name="Y")
+	static class Y {
+		@Id
+		long id;
+		String name;
+		@JoinTable
+		@ManyToOne X x;
+	}
+	@Entity(name="X")
+	@SQLRestriction("id>0")
+	static class X {
+		@Id
+		long id;
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/ManyToOneImplicitJoinTableTest.java

@@ -11,7 +11,8 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.AssertionsKt.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 @Jpa(annotatedClasses =
 		{ManyToOneImplicitJoinTableTest.X.class,
@@ -21,6 +22,7 @@ class ManyToOneImplicitJoinTableTest {
 	void test(EntityManagerFactoryScope scope) {
 		scope.inTransaction( s -> {
 			X x = new X();
+			x.id = 1;
 			Y y = new Y();
 			y.x = x;
 			s.persist( x );
@@ -34,8 +36,34 @@ void test(EntityManagerFactoryScope scope) {
 			Y y = s.find( Y.class, 0L );
 			assertEquals("Gavin", y.name);
 			assertNotNull(y.x);
+			assertEquals( 1L, y.x.id );
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			X x = new X();
+			x.id = -1;
+			s.persist( x );
+			y.x = x;
+			// uses a SQL merge to update the join table
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			assertEquals("Gavin", y.name);
+			assertNotNull(y.x);
+			assertEquals( -1L, y.x.id );
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			y.x = null;
+			// uses a SQL merge to update the join table
+		} );
+		scope.inTransaction( s -> {
+			Y y = s.find( Y.class, 0L );
+			assertEquals("Gavin", y.name);
+			assertNull(y.x);
 		} );
 	}
+
 	@Entity(name="Y")
 	static class Y {
 		@Id