HHH-19551 - Address deficiencies in pessimistic locking

Author: sebersole

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdSqlAstTranslator.java

@@ -145,16 +145,6 @@ protected void visitAnsiCaseSimpleExpression(
 		}
 	}
 
-	@Override
-	protected String getForUpdate() {
-		return " with lock";
-	}
-
-	@Override
-	protected String getForShare(int timeoutMillis) {
-		return getForUpdate();
-	}
-
 	protected boolean shouldEmulateFetchClause(QueryPart queryPart) {
 		// Percent fetches or ties fetches aren't supported in Firebird
 		// Before 3.0 there was also no support for window functions

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

@@ -12,15 +12,13 @@
 
 import jakarta.persistence.Timeout;
 import org.hibernate.QueryTimeoutException;
-import org.hibernate.Timeouts;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.dialect.aggregate.AggregateSupport;
 import org.hibernate.dialect.aggregate.MySQLAggregateSupport;
 import org.hibernate.dialect.function.CommonFunctionFactory;
 import org.hibernate.dialect.identity.IdentityColumnSupport;
 import org.hibernate.dialect.identity.MariaDBIdentityColumnSupport;
-import org.hibernate.dialect.lock.spi.LockTimeoutStyle;
 import org.hibernate.dialect.sequence.MariaDBSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.sql.ast.MariaDBSqlAstTranslator;
@@ -280,7 +278,9 @@ public SequenceInformationExtractor getSequenceInformationExtractor() {
 
 	@Override
 	public boolean supportsSkipLocked() {
-		//only supported on MySQL and as of 10.6
+		// only supported on MariaDB as of 10.6 (and MySQL 8.0)
+		// 		- MySQLDialect supports >= 8.0 so not overridden from the default (true) there.
+		//		- however, MariaDBDialect supports >= 10.5 so we need to check
 		return getVersion().isSameOrAfter( 10, 6 );
 	}
 
@@ -306,14 +306,6 @@ protected boolean supportsAliasLocks() {
 		return false;
 	}
 
-	@Override
-	public LockTimeoutStyle getLockTimeoutStyle(Timeout timeout) {
-		if ( timeout.milliseconds() == Timeouts.SKIP_LOCKED_MILLI && !supportsSkipLocked() ) {
-			return LockTimeoutStyle.UNSUPPORTED;
-		}
-		return LockTimeoutStyle.QUERY;
-	}
-
 	@Override
 	public Timeout getLockTimeout(Connection connection, SessionFactoryImplementor factory) {
 		// technically, Hibernate should never use these due to MariaDB supporting LockTimeoutStyle.QUERY;

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

@@ -1289,11 +1289,10 @@ public void setLockTimeout(Timeout timeout, Connection connection, SessionFactor
 
 	@Override
 	public LockTimeoutStyle getLockTimeoutStyle(Timeout timeout) {
-		if ( timeout.milliseconds() == Timeouts.SKIP_LOCKED_MILLI ) {
+		if ( timeout.milliseconds() == Timeouts.SKIP_LOCKED_MILLI && !supportsSkipLocked() ) {
 			return LockTimeoutStyle.UNSUPPORTED;
 		}
-
-		return LockTimeoutStyle.CONNECTION;
+		return LockTimeoutStyle.QUERY;
 	}
 
 	@Override