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

Use bind markers for BY_INDEX and BY_NAME IN queries.

Browse Source 
Closes #1172
Original pull request: #1178.
This commit is contained in:
samueldlightfoot
2021-10-11 17:52:14 +01:00
committed by Mark Paluch
parent 3878c00f8c
commit 813de10bb4
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java
View File

@@ -69,6 +69,7 @@ import org.springframework.util.ClassUtils;
import com.datastax.oss.driver.api.core.CqlIdentifier;
import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder;
import com.datastax.oss.driver.api.querybuilder.BindMarker;
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
import com.datastax.oss.driver.api.querybuilder.condition.Condition;
import com.datastax.oss.driver.api.querybuilder.condition.ConditionBuilder;
@@ -91,6 +92,7 @@ import com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments;
*
* @author Mark Paluch
* @author John Blum
* @author Sam Lightfoot
* @see com.datastax.oss.driver.api.core.cql.Statement
* @see org.springframework.data.cassandra.core.query.Query
* @see org.springframework.data.cassandra.core.query.Update
@@ -966,6 +968,11 @@ public class StatementFactory {
if (predicate.getValue() instanceof List
|| (predicate.getValue() != null && predicate.getValue().getClass().isArray())) {
Term term = factory.create(predicate.getValue());
if (term instanceof BindMarker) {
return column.in((BindMarker) term);
}
return column.in(toLiterals(predicate.getValue()));
}
@@ -1031,6 +1038,11 @@ public class StatementFactory {
if (predicate.getValue() instanceof List
|| (predicate.getValue() != null && predicate.getValue().getClass().isArray())) {
Term term = factory.create(predicate.getValue());
if (term instanceof BindMarker) {
return column.in((BindMarker) term);
}
return column.in(toLiterals(predicate.getValue()));
}

11
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/StatementFactoryUnitTests.java
View File

@@ -53,6 +53,7 @@ import com.datastax.oss.driver.api.querybuilder.select.Select;
* Unit tests for {@link StatementFactory}.
*
* @author Mark Paluch
* @author Sam Lightfoot
*/
class StatementFactoryUnitTests {
@@ -170,6 +171,16 @@ class StatementFactoryUnitTests {
.isEqualTo("SELECT * FROM group LIMIT 10 ALLOW FILTERING");
}
@Test
void shouldMapSelectInQuery() {
Query query = Query.query(Criteria.where("foo").in("bar"));
StatementBuilder<Select> select = statementFactory.select(query, groupEntity);
assertThat(select.build(ParameterHandling.INLINE).getQuery()).isEqualTo("SELECT * FROM group WHERE foo IN ('bar')");
}
@Test // DATACASS-343
void shouldMapDeleteQueryWithColumns() {

4
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java
View File

@@ -159,7 +159,7 @@ class PartTreeCassandraQueryUnitTests {
String query = deriveQueryFromMethod(Repo.class, "findByFirstnameIn", new Class[] { Collection.class },
Arrays.asList("Hank", "Walter")).getQuery();
assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname IN ('Hank','Walter')");
assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname IN ?");
}
@Test // DATACASS-172
@@ -186,7 +186,7 @@ class PartTreeCassandraQueryUnitTests {
String query = deriveQueryFromMethod(Repo.class, "findByMainAddressIn", new Class[] { Collection.class },
Collections.singleton(udtValue)).getQuery();
assertThat(query).isEqualTo("SELECT * FROM person WHERE mainaddress IN ({city:NULL,country:NULL})");
assertThat(query).isEqualTo("SELECT * FROM person WHERE mainaddress IN ?");
}
@Test // DATACASS-343