From 615c79cb3ee35a6e6750f87797b2dfe07550315a Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 12 Sep 2024 09:23:05 +0200 Subject: [PATCH] Polishing. See #1873 Original pull request #1875 --- .../core/dialect/JdbcSqlServerDialectTest.java | 18 +++++++++++++++++- .../core/dialect/SqlServerDialect.java | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/dialect/JdbcSqlServerDialectTest.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/dialect/JdbcSqlServerDialectTest.java index aee7e1fd76..34dacfda89 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/dialect/JdbcSqlServerDialectTest.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/dialect/JdbcSqlServerDialectTest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2024 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.jdbc.core.dialect; import java.time.Instant; @@ -14,8 +29,9 @@ */ class JdbcSqlServerDialectTest { - @Test + @Test // GH-1873 void testCustomConversions() { + JdbcCustomConversions jdbcCustomConversions = new JdbcCustomConversions( (List) JdbcSqlServerDialect.INSTANCE.getConverters()); diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SqlServerDialect.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SqlServerDialect.java index ab6a3fc033..2eb2a1ee9a 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SqlServerDialect.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SqlServerDialect.java @@ -81,6 +81,7 @@ public Position getClausePosition() { @Override public String getLock(LockOptions lockOptions) { + return switch (lockOptions.getLockMode()) { case PESSIMISTIC_WRITE -> "WITH (UPDLOCK, ROWLOCK)"; case PESSIMISTIC_READ -> "WITH (HOLDLOCK, ROWLOCK)";