HHH-17421 Ensure that no follow-on locking happens on SQL Server and …

…Sybase ASE
hibernate · May 7, 2024 · 23fecb1 · 23fecb1
1 parent 604c896
commit 23fecb1
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 0 deletions.
diff --git a/...alects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java b/...alects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java
@@ -293,6 +293,15 @@ private void renderLockHint(LockMode lockMode) {
 		}
 	}
 
+	@Override
+	protected LockStrategy determineLockingStrategy(
+			QuerySpec querySpec,
+			ForUpdateClause forUpdateClause,
+			Boolean followOnLocking) {
+		// No need for follow on locking
+		return LockStrategy.CLAUSE;
+	}
+
 	@Override
 	protected void renderForUpdateClause(QuerySpec querySpec, ForUpdateClause forUpdateClause) {
 		// SQL Server does not support the FOR UPDATE clause

diff --git a/...alects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java b/...alects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java
@@ -271,6 +271,15 @@ protected void renderTableGroupJoin(TableGroupJoin tableGroupJoin, List<TableGro
 		}
 	}
 
+	@Override
+	protected LockStrategy determineLockingStrategy(
+			QuerySpec querySpec,
+			ForUpdateClause forUpdateClause,
+			Boolean followOnLocking) {
+		// No need for follow on locking
+		return LockStrategy.CLAUSE;
+	}
+
 	@Override
 	protected void renderForUpdateClause(QuerySpec querySpec, ForUpdateClause forUpdateClause) {
 		// Sybase ASE does not really support the FOR UPDATE clause

diff --git a/...-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqlAstTranslator.java b/...-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqlAstTranslator.java
@@ -183,6 +183,15 @@ private void renderLockHint(LockMode lockMode) {
 		}
 	}
 
+	@Override
+	protected LockStrategy determineLockingStrategy(
+			QuerySpec querySpec,
+			ForUpdateClause forUpdateClause,
+			Boolean followOnLocking) {
+		// No need for follow on locking
+		return LockStrategy.CLAUSE;
+	}
+
 	@Override
 	protected void renderForUpdateClause(QuerySpec querySpec, ForUpdateClause forUpdateClause) {
 		// Sybase does not support the FOR UPDATE clause

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java
@@ -271,6 +271,15 @@ private void renderLockHint(LockMode lockMode) {
 		}
 	}
 
+	@Override
+	protected LockStrategy determineLockingStrategy(
+			QuerySpec querySpec,
+			ForUpdateClause forUpdateClause,
+			Boolean followOnLocking) {
+		// No need for follow on locking
+		return LockStrategy.CLAUSE;
+	}
+
 	@Override
 	protected void renderForUpdateClause(QuerySpec querySpec, ForUpdateClause forUpdateClause) {
 		// SQL Server does not support the FOR UPDATE clause

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java
@@ -256,6 +256,15 @@ protected void renderTableGroupJoin(TableGroupJoin tableGroupJoin, List<TableGro
 		}
 	}
 
+	@Override
+	protected LockStrategy determineLockingStrategy(
+			QuerySpec querySpec,
+			ForUpdateClause forUpdateClause,
+			Boolean followOnLocking) {
+		// No need for follow on locking
+		return LockStrategy.CLAUSE;
+	}
+
 	@Override
 	protected void renderForUpdateClause(QuerySpec querySpec, ForUpdateClause forUpdateClause) {
 		// Sybase ASE does not really support the FOR UPDATE clause

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java
@@ -182,6 +182,15 @@ private void renderLockHint(LockMode lockMode) {
 		}
 	}
 
+	@Override
+	protected LockStrategy determineLockingStrategy(
+			QuerySpec querySpec,
+			ForUpdateClause forUpdateClause,
+			Boolean followOnLocking) {
+		// No need for follow on locking
+		return LockStrategy.CLAUSE;
+	}
+
 	@Override
 	protected void renderForUpdateClause(QuerySpec querySpec, ForUpdateClause forUpdateClause) {
 		// Sybase does not support the FOR UPDATE clause