Spring/spring-data-r2dbc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly translate absent convertible enum values to String[] using Postgres.

Browse Source 
We now correctly obtain the target type for a persistent property that should be converted into an array value prior to constructing Parameter.
Previously, we fell back to the actual type without considering potential converters which left collection-like enum properties without a value with the enum array type that was potentially not supported by the database driver.

Closes #593
This commit is contained in:
Mark Paluch
2021-05-03 15:53:15 +02:00
parent b140d18485
commit 016aab33f2
3 changed files with 98 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/r2dbc/core/DefaultReactiveDataAccessStrategy.java
View File

@@ -247,14 +247,16 @@ public class DefaultReactiveDataAccessStrategy implements ReactiveDataAccessStra
Class<?> actualType = null;
if (value.getValue() instanceof Collection) {
actualType = CollectionUtils.findCommonElementType((Collection<?>) value.getValue());
} else if (value.getClass().isArray()) {
actualType = value.getClass().getComponentType();
} else if (!value.isEmpty() && value.getValue().getClass().isArray()) {
actualType = value.getValue().getClass().getComponentType();
}
if (actualType == null) {
actualType = property.getActualType();
}
actualType = converter.getTargetType(actualType);
if (value.isEmpty()) {
Class<?> targetType = arrayColumns.getArrayType(actualType);

102
src/test/java/org/springframework/data/r2dbc/core/PostgresReactiveDataAccessStrategyTests.java
View File

@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.convert.WritingConverter;
import org.springframework.data.r2dbc.convert.EnumWriteSupport;
import org.springframework.data.r2dbc.dialect.PostgresDialect;
import org.springframework.data.r2dbc.mapping.OutboundRow;
import org.springframework.data.relational.core.sql.SqlIdentifier;
@@ -126,38 +127,90 @@ public class PostgresReactiveDataAccessStrategyTests extends ReactiveDataAccessS
assertThat(value.getType()).isEqualTo(String.class);
}
@Test // gh-252
void shouldConvertSetOfEnumToString() {
@Test // gh-252, gh-593
void shouldConvertCollectionOfEnumToString() {
DefaultReactiveDataAccessStrategy strategy = new DefaultReactiveDataAccessStrategy(PostgresDialect.INSTANCE,
Collections.singletonList(MyObjectsToStringConverter.INSTANCE));
DefaultReactiveDataAccessStrategy strategy = new DefaultReactiveDataAccessStrategy(PostgresDialect.INSTANCE);
WithEnumCollections withEnums = new WithEnumCollections();
withEnums.enumSet = EnumSet.of(MyEnum.ONE, MyEnum.TWO);
OutboundRow outboundRow = strategy.getOutboundRow(withEnums);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_set"));
Parameter value = outboundRow.get(SqlIdentifier.unquoted("enum_set"));
assertThat(value.getValue()).isEqualTo(new String[] { "ONE", "TWO" });
}
@Test // gh-252
void shouldConvertArrayOfEnumToString() {
DefaultReactiveDataAccessStrategy strategy = new DefaultReactiveDataAccessStrategy(PostgresDialect.INSTANCE,
Collections.singletonList(MyObjectsToStringConverter.INSTANCE));
WithEnumCollections withEnums = new WithEnumCollections();
withEnums.enumList = Arrays.asList(MyEnum.ONE, MyEnum.TWO);
withEnums.enumArray = new MyEnum[] { MyEnum.ONE, MyEnum.TWO };
OutboundRow outboundRow = strategy.getOutboundRow(withEnums);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_array"));
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_set"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_set")).getValue()).isEqualTo(new String[] { "ONE", "TWO" });
Parameter value = outboundRow.get(SqlIdentifier.unquoted("enum_array"));
assertThat(value.getValue()).isEqualTo(new String[] { "ONE", "TWO" });
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_array"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_array")).getValue())
.isEqualTo(new String[] { "ONE", "TWO" });
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_list"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_list")).getValue())
.isEqualTo(new String[] { "ONE", "TWO" });
}
@Test // gh-593
void shouldCorrectlyWriteConvertedEnumNullValues() {
DefaultReactiveDataAccessStrategy strategy = new DefaultReactiveDataAccessStrategy(PostgresDialect.INSTANCE);
WithEnumCollections withEnums = new WithEnumCollections();
OutboundRow outboundRow = strategy.getOutboundRow(withEnums);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_set"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_set")).getType()).isEqualTo(String[].class);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_array"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_array")).getType()).isEqualTo(String[].class);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_list"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_list")).getType()).isEqualTo(String[].class);
}
@Test // gh-593
void shouldConvertCollectionOfEnumNatively() {
DefaultReactiveDataAccessStrategy strategy = new DefaultReactiveDataAccessStrategy(PostgresDialect.INSTANCE,
Collections.singletonList(new MyEnumSupport()));
WithEnumCollections withEnums = new WithEnumCollections();
withEnums.enumSet = EnumSet.of(MyEnum.ONE, MyEnum.TWO);
withEnums.enumList = Arrays.asList(MyEnum.ONE, MyEnum.TWO);
withEnums.enumArray = new MyEnum[] { MyEnum.ONE, MyEnum.TWO };
OutboundRow outboundRow = strategy.getOutboundRow(withEnums);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_set"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_set")).getValue()).isInstanceOf(MyEnum[].class);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_array"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_array")).getValue()).isInstanceOf(MyEnum[].class);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_list"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_list")).getValue()).isInstanceOf(MyEnum[].class);
}
@Test // gh-593
void shouldCorrectlyWriteNativeEnumNullValues() {
DefaultReactiveDataAccessStrategy strategy = new DefaultReactiveDataAccessStrategy(PostgresDialect.INSTANCE,
Collections.singletonList(new MyEnumSupport()));
WithEnumCollections withEnums = new WithEnumCollections();
OutboundRow outboundRow = strategy.getOutboundRow(withEnums);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_set"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_set")).getType()).isEqualTo(MyEnum[].class);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_array"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_array")).getType()).isEqualTo(MyEnum[].class);
assertThat(outboundRow).containsKey(SqlIdentifier.unquoted("enum_list"));
assertThat(outboundRow.get(SqlIdentifier.unquoted("enum_list")).getType()).isEqualTo(MyEnum[].class);
}
@RequiredArgsConstructor
@@ -182,6 +235,7 @@ public class PostgresReactiveDataAccessStrategyTests extends ReactiveDataAccessS
MyEnum[] enumArray;
Set<MyEnum> enumSet;
List<MyEnum> enumList;
}
static class WithConversion {
@@ -216,4 +270,6 @@ public class PostgresReactiveDataAccessStrategyTests extends ReactiveDataAccessS
return myObjects.toString();
}
}
private static class MyEnumSupport extends EnumWriteSupport<MyEnum> {}
}

15
src/test/java/org/springframework/data/r2dbc/query/QueryMapperUnitTests.java
View File

@@ -417,6 +417,16 @@ class QueryMapperUnitTests {
assertThat(bindings.getCondition()).hasToString("person.alternative_name = ?[$1]");
}
@Test // gh-593
void mapQueryForEnumArrayShouldMapToStringList() {
Criteria criteria = Criteria.where("enumValue").in(MyEnum.ONE, MyEnum.TWO);
BoundCondition bindings = map(criteria);
assertThat(bindings.getCondition()).hasToString("person.enum_value IN (?[$1], ?[$2])");
}
private BoundCondition map(Criteria criteria) {
BindMarkersFactory markers = BindMarkersFactory.indexed("$", 1);
@@ -429,5 +439,10 @@ class QueryMapperUnitTests {
String name;
@Column("another_name") String alternative;
MyEnum enumValue;
}
enum MyEnum {
ONE, TWO,
}
}