diff --git a/pom.xml b/pom.xml index 335f5969b8..68286a9a26 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 3.4.0-SNAPSHOT + 3.4.0-1900-byte-array-to-uuid-SNAPSHOT pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index 84eeb178e0..7647d50c65 100644 --- a/spring-data-jdbc-distribution/pom.xml +++ b/spring-data-jdbc-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 3.4.0-SNAPSHOT + 3.4.0-1900-byte-array-to-uuid-SNAPSHOT ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index 266af71b96..55f7e05efa 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-jdbc - 3.4.0-SNAPSHOT + 3.4.0-1900-byte-array-to-uuid-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 3.4.0-SNAPSHOT + 3.4.0-1900-byte-array-to-uuid-SNAPSHOT diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQuery.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQuery.java index 3e8aebc44d..234041af36 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQuery.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQuery.java @@ -92,7 +92,8 @@ public class StringBasedJdbcQuery extends AbstractJdbcQuery { public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOperations operations, @Nullable RowMapper defaultRowMapper, JdbcConverter converter, QueryMethodEvaluationContextProvider evaluationContextProvider) { - this(queryMethod.getRequiredQuery(), queryMethod, operations, result -> (RowMapper) defaultRowMapper, converter, evaluationContextProvider); + this(queryMethod.getRequiredQuery(), queryMethod, operations, result -> (RowMapper) defaultRowMapper, + converter, evaluationContextProvider); } /** @@ -244,7 +245,7 @@ private JdbcValue writeValue(@Nullable Object value, TypeInformation typeInfo TypeInformation actualType = typeInformation.getActualType(); // tuple-binding - if (actualType != null && actualType.getType().isArray()) { + if (actualType != null && actualType.getType().isArray() && !actualType.getType().equals(byte[].class)) { TypeInformation nestedElementType = actualType.getRequiredActualType(); return writeCollection(collection, parameter.getActualSqlType(), diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java index babe95a795..c11335f216 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java @@ -41,7 +41,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.context.ApplicationListener; @@ -51,23 +50,13 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.data.annotation.Id; -import org.springframework.data.domain.Example; -import org.springframework.data.domain.ExampleMatcher; -import org.springframework.data.domain.Limit; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.ScrollPosition; -import org.springframework.data.domain.Slice; -import org.springframework.data.domain.Sort; -import org.springframework.data.domain.Window; +import org.springframework.data.domain.*; import org.springframework.data.jdbc.core.mapping.AggregateReference; import org.springframework.data.jdbc.repository.query.Modifying; import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory; import org.springframework.data.jdbc.testing.ConditionalOnDatabase; import org.springframework.data.jdbc.testing.DatabaseType; -import org.springframework.data.jdbc.testing.EnabledOnDatabase; import org.springframework.data.jdbc.testing.EnabledOnFeature; import org.springframework.data.jdbc.testing.IntegrationTest; import org.springframework.data.jdbc.testing.TestConfiguration; @@ -1357,6 +1346,52 @@ void queryWithTupleIn() { assertThat(result).containsOnly(two); } + @Test // GH-1900 + void queryByListOfByteArray() { + + byte[] oneBytes = { 1, 2, 3, 4, 5, 6, 7, 8 }; + DummyEntity one = createDummyEntity("one"); + one.setBytes(oneBytes); + one = repository.save(one); + + byte[] twoBytes = { 8, 7, 6, 5, 4, 3, 2, 1 }; + DummyEntity two = createDummyEntity("two"); + two.setBytes(twoBytes); + two = repository.save(two); + + byte[] threeBytes = { 3, 3, 3, 3, 3, 3, 3, 3 }; + DummyEntity three = createDummyEntity("three"); + three.setBytes(threeBytes); + three = repository.save(three); + + List result = repository.findByBytesIn(List.of(threeBytes, oneBytes)); + + assertThat(result).extracting("idProp").containsExactlyInAnyOrder(one.idProp, three.idProp); + } + + @Test // GH-1900 + void queryByByteArray() { + + byte[] oneBytes = { 1, 2, 3, 4, 5, 6, 7, 8 }; + DummyEntity one = createDummyEntity("one"); + one.setBytes(oneBytes); + one = repository.save(one); + + byte[] twoBytes = { 8, 7, 6, 5, 4, 3, 2, 1 }; + DummyEntity two = createDummyEntity("two"); + two.setBytes(twoBytes); + two = repository.save(two); + + byte[] threeBytes = { 3, 3, 3, 3, 3, 3, 3, 3 }; + DummyEntity three = createDummyEntity("three"); + three.setBytes(threeBytes); + three = repository.save(three); + + List result = repository.findByBytes(twoBytes); + + assertThat(result).extracting("idProp").containsExactly(two.idProp); + } + private Root createRoot(String namePrefix) { return new Root(null, namePrefix, @@ -1487,6 +1522,12 @@ interface DummyEntityRepository extends CrudRepository, Query @Query("SELECT * FROM DUMMY_ENTITY WHERE (ID_PROP, NAME) IN (:tuples)") List findByListInTuple(List tuples); + + @Query("SELECT * FROM DUMMY_ENTITY WHERE BYTES IN (:bytes)") + List findByBytesIn(List bytes); + + @Query("SELECT * FROM DUMMY_ENTITY WHERE BYTES = :bytes") + List findByBytes(byte[] bytes); } interface RootRepository extends ListCrudRepository { @@ -1810,6 +1851,7 @@ static class DummyEntity { boolean flag; AggregateReference ref; Direction direction; + byte[] bytes = new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 }; public DummyEntity(String name) { this.name = name; @@ -1890,6 +1932,10 @@ public int hashCode() { return Objects.hash(name, pointInTime, offsetDateTime, idProp, flag, ref, direction); } + public void setBytes(byte[] bytes) { + this.bytes = bytes; + } + @Override public String toString() { return "DummyEntity{" + "name='" + name + '\'' + ", idProp=" + idProp + '}'; diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-db2.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-db2.sql index e75d0a61bc..2c66f226e1 100644 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-db2.sql +++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-db2.sql @@ -12,7 +12,8 @@ CREATE TABLE dummy_entity OFFSET_DATE_TIME TIMESTAMP, -- with time zone is only supported with z/OS FLAG BOOLEAN, REF BIGINT, - DIRECTION VARCHAR(100) + DIRECTION VARCHAR(100), + BYTES BINARY(8) ); CREATE TABLE ROOT diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-h2.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-h2.sql index 724cd2ba00..b72f664535 100644 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-h2.sql +++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-h2.sql @@ -6,7 +6,8 @@ CREATE TABLE dummy_entity OFFSET_DATE_TIME TIMESTAMP WITH TIME ZONE, FLAG BOOLEAN, REF BIGINT, - DIRECTION VARCHAR(100) + DIRECTION VARCHAR(100), + BYTES BINARY(8) ); CREATE TABLE ROOT diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-hsql.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-hsql.sql index 724cd2ba00..b72f664535 100644 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-hsql.sql +++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-hsql.sql @@ -6,7 +6,8 @@ CREATE TABLE dummy_entity OFFSET_DATE_TIME TIMESTAMP WITH TIME ZONE, FLAG BOOLEAN, REF BIGINT, - DIRECTION VARCHAR(100) + DIRECTION VARCHAR(100), + BYTES BINARY(8) ); CREATE TABLE ROOT diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mariadb.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mariadb.sql index 7617b01bf2..75b4663989 100644 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mariadb.sql +++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mariadb.sql @@ -6,7 +6,8 @@ CREATE TABLE dummy_entity OFFSET_DATE_TIME TIMESTAMP(3), FLAG BOOLEAN, REF BIGINT, - DIRECTION VARCHAR(100) + DIRECTION VARCHAR(100), + BYTES BINARY(8) ); CREATE TABLE ROOT diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mssql.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mssql.sql index cabaa038b8..9959dea4a8 100644 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mssql.sql +++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mssql.sql @@ -12,7 +12,8 @@ CREATE TABLE dummy_entity OFFSET_DATE_TIME DATETIMEOFFSET, FLAG BIT, REF BIGINT, - DIRECTION VARCHAR(100) + DIRECTION VARCHAR(100), + BYTES VARBINARY(8) ); CREATE TABLE ROOT diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mysql.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mysql.sql index 00175585d7..0d3e16587f 100644 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mysql.sql +++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mysql.sql @@ -9,7 +9,8 @@ CREATE TABLE DUMMY_ENTITY OFFSET_DATE_TIME TIMESTAMP(3) DEFAULT NULL, FLAG BIT(1), REF BIGINT, - DIRECTION VARCHAR(100) + DIRECTION VARCHAR(100), + BYTES BINARY(8) ); CREATE TABLE ROOT diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql index 6383e3c624..0a08dfbf9e 100644 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql +++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql @@ -12,7 +12,8 @@ CREATE TABLE DUMMY_ENTITY OFFSET_DATE_TIME TIMESTAMP WITH TIME ZONE, FLAG NUMBER(1,0), REF NUMBER, - DIRECTION VARCHAR2(100) + DIRECTION VARCHAR2(100), + BYTES RAW(8) ); CREATE TABLE ROOT diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-postgres.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-postgres.sql index ca33b4ecd5..37ad6914de 100644 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-postgres.sql +++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-postgres.sql @@ -12,7 +12,8 @@ CREATE TABLE dummy_entity OFFSET_DATE_TIME TIMESTAMP WITH TIME ZONE, FLAG BOOLEAN, REF BIGINT, - DIRECTION VARCHAR(100) + DIRECTION VARCHAR(100), + BYTES BYTEA ); CREATE TABLE ROOT diff --git a/spring-data-r2dbc/pom.xml b/spring-data-r2dbc/pom.xml index e335b56501..1c17bee12a 100644 --- a/spring-data-r2dbc/pom.xml +++ b/spring-data-r2dbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-r2dbc - 3.4.0-SNAPSHOT + 3.4.0-1900-byte-array-to-uuid-SNAPSHOT Spring Data R2DBC Spring Data module for R2DBC @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 3.4.0-SNAPSHOT + 3.4.0-1900-byte-array-to-uuid-SNAPSHOT diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index 6be1155d38..50310ac61c 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-relational - 3.4.0-SNAPSHOT + 3.4.0-1900-byte-array-to-uuid-SNAPSHOT Spring Data Relational Spring Data Relational support @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 3.4.0-SNAPSHOT + 3.4.0-1900-byte-array-to-uuid-SNAPSHOT