From d700f969ce1377072084a1164f8639d1ace0db83 Mon Sep 17 00:00:00 2001 From: Moad Elfatihi Date: Sat, 15 Nov 2025 21:51:17 +0100 Subject: [PATCH] remove unecessary lock override for hsql dialect --- .../main/java/org/hibernate/dialect/HSQLDialect.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java index 7ffce92c5546..9a636cb29992 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java @@ -6,7 +6,6 @@ import jakarta.persistence.TemporalType; import org.checkerframework.checker.nullness.qual.Nullable; -import org.hibernate.LockOptions; import org.hibernate.boot.model.FunctionContributions; import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.function.TrimFunction; @@ -50,11 +49,9 @@ import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; -import org.hibernate.sql.ast.spi.LockingClauseStrategy; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.select.QuerySpec; import org.hibernate.sql.exec.spi.JdbcOperation; import org.hibernate.sql.model.MutationOperation; import org.hibernate.sql.model.internal.OptionalTableUpdate; @@ -68,7 +65,6 @@ import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; import static org.hibernate.internal.util.JdbcExceptionHelper.extractErrorCode; -import static org.hibernate.sql.ast.internal.NonLockingClauseStrategy.NON_CLAUSE_STRATEGY; import static org.hibernate.type.SqlTypes.DOUBLE; import static org.hibernate.type.SqlTypes.NCLOB; @@ -413,14 +409,6 @@ public boolean supportsDistinctFromPredicate() { return true; } - @Override - public LockingClauseStrategy getLockingClauseStrategy(QuerySpec querySpec, LockOptions lockOptions) { - if ( getVersion().isBefore( 2 ) ) { - return NON_CLAUSE_STRATEGY; - } - return super.getLockingClauseStrategy( querySpec, lockOptions ); - } - @Override public LockingSupport getLockingSupport() { return HSQLLockingSupport.LOCKING_SUPPORT;