Skip to content

Support bind markers for IN queries #1178

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

Closed
wants to merge 1 commit into from
Closed

Support bind markers for IN queries #1178

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
12 changes: 12 additions & 0 deletions ...ata-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@

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;
Expand All @@ -91,6 +92,7 @@
*
* @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
Expand Down Expand Up @@ -966,6 +968,11 @@ private static Relation toClause(CriteriaDefinition criteriaDefinition, TermFact

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()));
}

Expand Down Expand Up @@ -1031,6 +1038,11 @@ private static Condition toCondition(CriteriaDefinition criteriaDefinition, Term

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()));
}

Expand Down
11 changes: 11 additions & 0 deletions ...ndra/src/test/java/org/springframework/data/cassandra/core/StatementFactoryUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
* Unit tests for {@link StatementFactory}.
*
* @author Mark Paluch
* @author Sam Lightfoot
*/
class StatementFactoryUnitTests {

Expand Down Expand Up @@ -170,6 +171,16 @@ void shouldMapSelectQueryWithLimitAndAllowFiltering() {
.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() {

Expand Down
4 changes: 2 additions & 2 deletions .../org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ void shouldDeriveFieldInCollectionQuery() {
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
Expand All @@ -186,7 +186,7 @@ void shouldDeriveUdtInCollectionQuery() {
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
Expand Down