From 94a8932b9e779615069f089dc37813626fa7419d Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 4 Mar 2019 14:49:02 +0100 Subject: [PATCH] DATAJDBC-335 - Polishing. Formatting and one additional test. Original pull request: #121. --- .../core/sql/render/DeleteRendererUnitTests.java | 8 +++++--- .../core/sql/render/SelectRendererUnitTests.java | 5 +++-- .../core/sql/render/UpdateRendererUnitTests.java | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/DeleteRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/DeleteRendererUnitTests.java index ddaf1b091..54926caa9 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/DeleteRendererUnitTests.java +++ b/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 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"); } diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java index c38fd2606..cf161f5ae 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java +++ b/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")) // .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 diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java index 3f054475e..7a05f4caa 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java +++ b/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 = ?"); } + @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() {