HHH-19330 - Fix for issue

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java

@@ -1316,6 +1316,11 @@ public String getReadLockString(String aliases, int timeout) {
 		return withTimeout(" for share of " + aliases, timeout );
 	}
 
+	@Override
+	public String getForUpdateString() {
+		return " for no key update";
+	}
+
 	@Override
 	public String getForUpdateNowaitString() {
 		return supportsNoWait()

hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java

@@ -188,7 +188,7 @@ protected void renderMaterializationHint(CteMaterialization materialization) {
 
 	@Override
 	protected String getForUpdate() {
-		return " for no key update";
+		return getDialect().getForUpdateString();
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java

@@ -28,7 +28,7 @@ public void testLockTimeoutNoAliasNoTimeout() {
 				dialect.getForUpdateString( new LockOptions( LockMode.PESSIMISTIC_READ ) )
 		);
 		assertEquals(
-				" for update",
+				" for no key update",
 				dialect.getForUpdateString( new LockOptions( LockMode.PESSIMISTIC_WRITE ) )
 		);
 	}
@@ -41,7 +41,7 @@ public void testLockTimeoutNoAliasNoWait() {
 													.setTimeOut( LockOptions.NO_WAIT ) )
 		);
 		assertEquals(
-				" for update nowait",
+				" for no key update nowait",
 				dialect.getForUpdateString( new LockOptions( LockMode.PESSIMISTIC_WRITE )
 													.setTimeOut( LockOptions.NO_WAIT ) )
 		);
@@ -55,7 +55,7 @@ public void testLockTimeoutNoAliasSkipLocked() {
 													.setTimeOut( LockOptions.SKIP_LOCKED ) )
 		);
 		assertEquals(
-				" for update skip locked",
+				" for no key update skip locked",
 				dialect.getForUpdateString( new LockOptions( LockMode.PESSIMISTIC_WRITE )
 													.setTimeOut( LockOptions.SKIP_LOCKED ) )
 		);
@@ -75,7 +75,7 @@ public void testLockTimeoutAliasNoTimeout() {
 				)
 		);
 		assertEquals(
-				" for update of a",
+				" for no key update of a",
 				dialect.getForUpdateString(
 						alias,
 						new LockOptions( LockMode.PESSIMISTIC_WRITE ).setAliasSpecificLockMode(
@@ -101,7 +101,7 @@ public void testLockTimeoutAliasNoWait() {
 				)
 		);
 		assertEquals(
-				" for update of a nowait",
+				" for no key update of a nowait",
 				dialect.getForUpdateString(
 						alias,
 						new LockOptions( LockMode.PESSIMISTIC_WRITE ).setAliasSpecificLockMode(
@@ -128,7 +128,7 @@ public void testLockTimeoutAliasSkipLocked() {
 				)
 		);
 		assertEquals(
-				" for update of a skip locked",
+				" for no key update of a skip locked",
 				dialect.getForUpdateString(
 						alias,
 						new LockOptions( LockMode.PESSIMISTIC_WRITE ).setAliasSpecificLockMode(

hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadLockingTest.java

@@ -33,7 +33,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -243,9 +242,6 @@ void testMultiLoadCompositeIdEntityPessimisticReadLockAlreadyInSession(SessionFa
 
 	// (3) simple Id entity w/ pessimistic write lock (one in L1C & some in L2C)
 	@Test
-	@SkipForDialect( dialectClass = PostgreSQLDialect.class, matchSubTypes = true,
-			reason = "Excluding PostgreSQL dialects for now; multiload of natural id entities where one is already "
-					+ "in the session produces more than 1 select, and they have different update lock strings")
 	public void testMultiLoadSimpleIdEntityPessimisticWriteLockSomeInL1CAndSomeInL2C(SessionFactoryScope scope) {
 		final Integer userInL2CId = userIds.get(0);
 		final Integer userInL1CId = userIds.get(1);