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

Conditions are Expressions.

Browse Source 
Selection of condition expressions yielding a boolean value is supported by some databases.

Closes #1007
Original pull request: #1079.
This commit is contained in:
Jens Schauder
2021-11-04 07:18:40 +01:00
committed by Mark Paluch
parent 239f8c75bd
commit bd8b3c63d9
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Condition.java
View File

@@ -23,7 +23,7 @@ package org.springframework.data.relational.core.sql;
* @since 1.1
* @see Conditions
*/
public interface Condition extends Segment {
public interface Condition extends Segment, Expression {
/**
* Combine another {@link Condition} using {@code AND}.

8
spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/ComparisonVisitor.java
View File

@@ -52,14 +52,14 @@ class ComparisonVisitor extends FilteredSubtreeVisitor {
@Override
Delegation enterNested(Visitable segment) {
if (segment instanceof Expression) {
ExpressionVisitor visitor = new ExpressionVisitor(context);
if (segment instanceof Condition) {
ConditionVisitor visitor = new ConditionVisitor(context);
current = visitor;
return Delegation.delegateTo(visitor);
}
if (segment instanceof Condition) {
ConditionVisitor visitor = new ConditionVisitor(context);
if (segment instanceof Expression) {
ExpressionVisitor visitor = new ExpressionVisitor(context);
current = visitor;
return Delegation.delegateTo(visitor);
}

12
spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/FilteredSingleConditionRenderSupport.java
View File

@@ -28,6 +28,7 @@ import org.springframework.util.Assert;
* and delegate nested {@link Expression} and {@link Condition} rendering.
*
* @author Mark Paluch
* @author Jens Schauder
* @since 1.1
*/
abstract class FilteredSingleConditionRenderSupport extends FilteredSubtreeVisitor {
@@ -55,17 +56,18 @@ abstract class FilteredSingleConditionRenderSupport extends FilteredSubtreeVisit
@Override
Delegation enterNested(Visitable segment) {
if (segment instanceof Condition) {
ConditionVisitor visitor = new ConditionVisitor(context);
current = visitor;
return Delegation.delegateTo(visitor);
}
if (segment instanceof Expression) {
ExpressionVisitor visitor = new ExpressionVisitor(context);
current = visitor;
return Delegation.delegateTo(visitor);
}
if (segment instanceof Condition) {
ConditionVisitor visitor = new ConditionVisitor(context);
current = visitor;
return Delegation.delegateTo(visitor);
}
throw new IllegalStateException("Cannot provide visitor for " + segment);
}

14
spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java
View File

@@ -480,6 +480,20 @@ class SelectRendererUnitTests {
assertThat(rendered).isEqualTo("SELECT CAST(User.name AS VARCHAR2) FROM User");
}
@Test // GH-1007
void shouldRenderConditionAsExpression() {
Table table = SQL.table("User");
Select select = StatementBuilder.select( //
Conditions.isGreater(table.column("age"), SQL.literalOf(18)) //
) //
.from(table) //
.build();
final String rendered = SqlRenderer.toString(select);
assertThat(rendered).isEqualTo("SELECT User.age > 18 FROM User");
}
@Test // GH-968
void rendersFullyQualifiedNamesInOrderBy() {