Browse Source

DATAJDBC-335 - Polishing.

Formatting and one additional test.

Original pull request: #121.
pull/122/head
Jens Schauder 7 years ago
parent
commit
94a8932b9e
  1. 8
      spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/DeleteRendererUnitTests.java
  2. 5
      spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java
  3. 15
      spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java

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

@ -18,7 +18,6 @@ package org.springframework.data.relational.core.sql.render;
import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.data.relational.core.sql.Delete; import org.springframework.data.relational.core.sql.Delete;
import org.springframework.data.relational.core.sql.SQL; import org.springframework.data.relational.core.sql.SQL;
import org.springframework.data.relational.core.sql.Table; import org.springframework.data.relational.core.sql.Table;
@ -45,7 +44,8 @@ public class DeleteRendererUnitTests {
Table table = Table.create("bar"); Table table = Table.create("bar");
Delete delete = Delete.builder().from(table).where(table.column("foo").isEqualTo(table.column("baz"))) Delete delete = Delete.builder().from(table) //
.where(table.column("foo").isEqualTo(table.column("baz"))) //
.and(table.column("doe").isNull()).build(); .and(table.column("doe").isNull()).build();
assertThat(SqlRenderer.toString(delete)).isEqualTo("DELETE FROM bar WHERE bar.foo = bar.baz AND bar.doe IS NULL"); assertThat(SqlRenderer.toString(delete)).isEqualTo("DELETE FROM bar WHERE bar.foo = bar.baz AND bar.doe IS NULL");
@ -56,7 +56,9 @@ public class DeleteRendererUnitTests {
Table table = Table.create("bar").as("my_bar"); Table table = Table.create("bar").as("my_bar");
Delete delete = Delete.builder().from(table).where(table.column("foo").isEqualTo(table.column("baz"))).build(); Delete delete = Delete.builder().from(table) //
.where(table.column("foo").isEqualTo(table.column("baz"))) //
.build();
assertThat(SqlRenderer.toString(delete)).isEqualTo("DELETE FROM bar AS my_bar WHERE my_bar.foo = my_bar.baz"); assertThat(SqlRenderer.toString(delete)).isEqualTo("DELETE FROM bar AS my_bar WHERE my_bar.foo = my_bar.baz");
} }

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

@ -118,8 +118,9 @@ public class SelectRendererUnitTests {
.and(employee.column("tenant")).equals(department.column("tenant")) // .and(employee.column("tenant")).equals(department.column("tenant")) //
.build(); .build();
assertThat(SqlRenderer.toString(select)).isEqualTo("SELECT employee.id, department.name FROM employee " assertThat(SqlRenderer.toString(select)).isEqualTo("SELECT employee.id, department.name FROM employee " //
+ "JOIN department ON employee.department_id = department.id " + "AND employee.tenant = department.tenant"); + "JOIN department ON employee.department_id = department.id " //
+ "AND employee.tenant = department.tenant");
} }
@Test // DATAJDBC-309 @Test // DATAJDBC-309

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

@ -43,6 +43,21 @@ public class UpdateRendererUnitTests {
assertThat(SqlRenderer.toString(update)).isEqualTo("UPDATE mytable SET mytable.foo = ?"); assertThat(SqlRenderer.toString(update)).isEqualTo("UPDATE mytable SET mytable.foo = ?");
} }
@Test // DATAJDBC-335
public void shouldRenderMultipleColumnUpdate() {
Table table = SQL.table("mytable");
Column foo = table.column("foo");
Column bar = table.column("bar");
Update update = StatementBuilder.update(table) //
.set(foo.set(SQL.bindMarker())) //
.and(bar.set(SQL.bindMarker())) //
.build();
assertThat(SqlRenderer.toString(update)).isEqualTo("UPDATE mytable SET mytable.foo = ?, mytable.bar = ?");
}
@Test // DATAJDBC-335 @Test // DATAJDBC-335
public void shouldRenderUpdateWithLiteral() { public void shouldRenderUpdateWithLiteral() {

Loading…
Cancel
Save