Skip to content

Commit 94a8932

Browse files
committed
DATAJDBC-335 - Polishing.
Formatting and one additional test. Original pull request: #121.
1 parent a11c121 commit 94a8932

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/DeleteRendererUnitTests.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import static org.assertj.core.api.Assertions.*;
1919

2020
import org.junit.Test;
21-
2221
import org.springframework.data.relational.core.sql.Delete;
2322
import org.springframework.data.relational.core.sql.SQL;
2423
import org.springframework.data.relational.core.sql.Table;
@@ -45,7 +44,8 @@ public void shouldRenderWithCondition() {
4544

4645
Table table = Table.create("bar");
4746

48-
Delete delete = Delete.builder().from(table).where(table.column("foo").isEqualTo(table.column("baz")))
47+
Delete delete = Delete.builder().from(table) //
48+
.where(table.column("foo").isEqualTo(table.column("baz"))) //
4949
.and(table.column("doe").isNull()).build();
5050

5151
assertThat(SqlRenderer.toString(delete)).isEqualTo("DELETE FROM bar WHERE bar.foo = bar.baz AND bar.doe IS NULL");
@@ -56,7 +56,9 @@ public void shouldConsiderTableAlias() {
5656

5757
Table table = Table.create("bar").as("my_bar");
5858

59-
Delete delete = Delete.builder().from(table).where(table.column("foo").isEqualTo(table.column("baz"))).build();
59+
Delete delete = Delete.builder().from(table) //
60+
.where(table.column("foo").isEqualTo(table.column("baz"))) //
61+
.build();
6062

6163
assertThat(SqlRenderer.toString(delete)).isEqualTo("DELETE FROM bar AS my_bar WHERE my_bar.foo = my_bar.baz");
6264
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,9 @@ public void shouldRenderSimpleJoinWithAnd() {
118118
.and(employee.column("tenant")).equals(department.column("tenant")) //
119119
.build();
120120

121-
assertThat(SqlRenderer.toString(select)).isEqualTo("SELECT employee.id, department.name FROM employee "
122-
+ "JOIN department ON employee.department_id = department.id " + "AND employee.tenant = department.tenant");
121+
assertThat(SqlRenderer.toString(select)).isEqualTo("SELECT employee.id, department.name FROM employee " //
122+
+ "JOIN department ON employee.department_id = department.id " //
123+
+ "AND employee.tenant = department.tenant");
123124
}
124125

125126
@Test // DATAJDBC-309

spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,21 @@ public void shouldRenderSimpleUpdate() {
4343
assertThat(SqlRenderer.toString(update)).isEqualTo("UPDATE mytable SET mytable.foo = ?");
4444
}
4545

46+
@Test // DATAJDBC-335
47+
public void shouldRenderMultipleColumnUpdate() {
48+
49+
Table table = SQL.table("mytable");
50+
Column foo = table.column("foo");
51+
Column bar = table.column("bar");
52+
53+
Update update = StatementBuilder.update(table) //
54+
.set(foo.set(SQL.bindMarker())) //
55+
.and(bar.set(SQL.bindMarker())) //
56+
.build();
57+
58+
assertThat(SqlRenderer.toString(update)).isEqualTo("UPDATE mytable SET mytable.foo = ?, mytable.bar = ?");
59+
}
60+
4661
@Test // DATAJDBC-335
4762
public void shouldRenderUpdateWithLiteral() {
4863

0 commit comments

Comments
 (0)