DATAJDBC-335 - Polishing.

Formatting and one additional test.

Original pull request: #121.
This commit is contained in:
Jens Schauder
2019-03-04 14:49:02 +01:00
parent a11c121407
commit 94a8932b9e
3 changed files with 23 additions and 5 deletions

View File

@@ -18,7 +18,6 @@ package org.springframework.data.relational.core.sql.render;
import static org.assertj.core.api.Assertions.*;
import org.junit.Test;
import org.springframework.data.relational.core.sql.Delete;
import org.springframework.data.relational.core.sql.SQL;
import org.springframework.data.relational.core.sql.Table;
@@ -45,7 +44,8 @@ public class DeleteRendererUnitTests {
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();
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");
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");
}

View File

@@ -118,8 +118,9 @@ public class SelectRendererUnitTests {
.and(employee.column("tenant")).equals(department.column("tenant")) //
.build();
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");
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");
}
@Test // DATAJDBC-309

View File

@@ -43,6 +43,21 @@ public class UpdateRendererUnitTests {
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
public void shouldRenderUpdateWithLiteral() {