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

Polishing.

Browse Source 
Reformat code. Add since tag.

See #995
Original pull request: #1014.
This commit is contained in:
Mark Paluch
2021-09-28 14:55:02 +02:00
parent 82c70ab99f
commit 9844f40580
3 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,13 +37,13 @@ import org.springframework.lang.Nullable;
class DefaultSelectBuilder implements SelectBuilder, SelectAndFrom, SelectFromAndJoin, SelectWhereAndOr {
private boolean distinct = false;
private List<Expression> selectList = new ArrayList<>();
private List<TableLike> from = new ArrayList<>();
private final List<Expression> selectList = new ArrayList<>();
private final List<TableLike> from = new ArrayList<>();
private long limit = -1;
private long offset = -1;
private List<Join> joins = new ArrayList<>();
private final List<Join> joins = new ArrayList<>();
private @Nullable Condition where;
private List<OrderByField> orderBy = new ArrayList<>();
private final List<OrderByField> orderBy = new ArrayList<>();
private @Nullable LockMode lockMode;
/*

6
spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SelectBuilder.java
View File

@@ -503,13 +503,13 @@ public interface SelectBuilder {
SelectOnConditionComparison on(Expression column);
/**
* Declare a join condition in one step.
*
* Using conditions allows more flexibility in comparison to {@link #on(Expression)} which only allows for equality comparisons chained together with `AND`.
* Declare a join {@link Condition condition} in one step. Using conditions allows more flexibility in comparison to
* {@link #on(Expression)} which only allows for equality comparisons chained together with {@code AND}.
*
* @param condition must not be {@literal null}.
* @return {@code this} builder.
* @see Conditions
* @since 2.3
*/
SelectFromAndJoinCondition on(Condition condition);
}

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

@@ -156,8 +156,8 @@ class SelectRendererUnitTests {
+ "AND employee.tenant = department.tenant");
}
@Test // GH-995
public void shouldRenderArbitraryJoinCondition() {
@Test // #995
void shouldRenderArbitraryJoinCondition() {
Table employee = SQL.table("employee");
Table department = SQL.table("department");
@@ -166,11 +166,9 @@ class SelectRendererUnitTests {
.select(employee.column("id"), department.column("name")) //
.from(employee) //
.join(department) //
.on(
Conditions.isEqual( employee.column("department_id"),department.column("id")) //
.or( //
Conditions.isNotEqual( employee.column("tenant"),department.column("tenant")) //
)) //
.on(Conditions.isEqual(employee.column("department_id"), department.column("id")) //
.or(Conditions.isNotEqual(employee.column("tenant"), department.column("tenant")) //
))
.build();
assertThat(SqlRenderer.toString(select)).isEqualTo("SELECT employee.id, department.name FROM employee " //
@@ -424,16 +422,12 @@ class SelectRendererUnitTests {
"SELECT COUNT(\"my_table\".*) AS counter, \"my_table\".\"reserved_keyword\" FROM \"my_table\" JOIN \"join_table\" ON \"my_table\".source = \"join_table\".target");
}
@Test // GH-1034
void simpleComparisonWithStringArguments() {
Table table_user = SQL.table("User");
Select select = StatementBuilder
.select(table_user.column("name"),table_user.column("age"))
.from(table_user)
.where(Comparison.create("age",">",20))
.build();
Select select = StatementBuilder.select(table_user.column("name"), table_user.column("age")).from(table_user)
.where(Comparison.create("age", ">", 20)).build();
final String rendered = SqlRenderer.toString(select);
assertThat(rendered).isEqualTo("SELECT User.name, User.age FROM User WHERE age > 20");
@@ -443,11 +437,8 @@ class SelectRendererUnitTests {
void simpleComparison() {
Table table_user = SQL.table("User");
Select select = StatementBuilder
.select(table_user.column("name"),table_user.column("age"))
.from(table_user)
.where(Comparison.create(table_user.column("age"),">",SQL.literalOf(20)))
.build();
Select select = StatementBuilder.select(table_user.column("name"), table_user.column("age")).from(table_user)
.where(Comparison.create(table_user.column("age"), ">", SQL.literalOf(20))).build();
final String rendered = SqlRenderer.toString(select);
assertThat(rendered).isEqualTo("SELECT User.name, User.age FROM User WHERE User.age > 20");