Skip to content

GH-2188 - Preserve JDBCType.OTHER for custom converters in string-based queries #2193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
parazit-IR wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-2188 - Preserve JDBCType.OTHER for custom converters in string-based queries #2193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...bc/src/main/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,10 @@ private MapSqlParameterSource bindParameters(RelationalParameterAccessor accesso
JdbcValue jdbcValue = JdbcValueBindUtil.getBindValue(converter, value, parameter);
SQLType jdbcType = jdbcValue.getJdbcType();

if (jdbcType == JDBCType.OTHER) {
parameters.addValue(parameterName, jdbcValue.getValue());
} else {
if (jdbcType != null) {
parameters.addValue(parameterName, jdbcValue.getValue(), jdbcType.getVendorTypeNumber());
} else {
parameters.addValue(parameterName, jdbcValue.getValue());
}
}

Expand Down
26 changes: 26 additions & 0 deletions ...st/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,18 @@ void spelCanBeUsedInsideQueries() {
assertThat(paramSource.getValue().getValue("__$synthetic$__2")).isEqualTo("test-value2");
}

@Test // GH-2188
void shouldPreserveJdbcTypeOtherFromJdbcValueInStringBasedQuery() {

SqlParameterSource parameterSource = forMethod("findByCustomValue", Direction.class)
.withCustomConverters(DirectionToOtherJdbcTypeConverter.INSTANCE)
.withArguments(Direction.LEFT)
.extractParameterSource();

assertThat(parameterSource.getSqlType("value"))
.isEqualTo(JDBCType.OTHER.getVendorTypeNumber());
}

QueryFixture forMethod(String name, Class... paramTypes) {
return new QueryFixture(createMethod(name, paramTypes));
}
Expand Down Expand Up @@ -562,6 +574,9 @@ interface MyRepository extends Repository<Object, Long> {
@Lock(value = LockMode.PESSIMISTIC_READ)
@Query("SELECT * FROM person WHERE id = :id")
DummyEntity unsupportedWithLock(Long id);

@Query(value = "some sql statement") // GH-2188
List<DummyEntity> findByCustomValue(@Param("value") Direction value);
}

private static class CustomRowMapper implements RowMapper<Object> {
Expand Down Expand Up @@ -655,6 +670,17 @@ public String convert(ListContainer source) {
}
}

@WritingConverter // GH-2188
enum DirectionToOtherJdbcTypeConverter implements Converter<Direction, JdbcValue> {

INSTANCE;

@Override
public JdbcValue convert(Direction source) {
return JdbcValue.of(source.name(), JDBCType.OTHER);
}
}

private static class DummyEntity {
private final Long id;

Expand Down