From 2b9ae3ef73810f96a6c0cce22490730b508defaf Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 19 Feb 2019 09:28:24 +0100 Subject: [PATCH] DATAJDBC-334 - Polishing. Original pull request: #120. --- .../data/jdbc/core/SqlGenerator.java | 9 +++++-- .../data/jdbc/core/SqlGeneratorUnitTests.java | 24 ++++++++++++------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java index 1aecf62a..6f9d23bb 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java @@ -360,8 +360,13 @@ class SqlGenerator { .map(n -> String.format("%s = :%s", n, columnNameToParameterName(n))) // .collect(Collectors.joining(", ")); - return String.format(updateTemplate, entity.getTableName(), setClause, entity.getIdColumn(), - columnNameToParameterName(entity.getIdColumn())); + return String.format( // + updateTemplate, // + entity.getTableName(), // + setClause, // + entity.getIdColumn(), // + columnNameToParameterName(entity.getIdColumn()) // + ); } private String createDeleteSql() { diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java index 3211312d..3e082a8e 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java @@ -87,7 +87,7 @@ public class SqlGeneratorUnitTests { @Test // DATAJDBC-112 public void cascadingDeleteFirstLevel() { - String sql = sqlGenerator.createDeleteByPath(getPath("ref", DummyEntity.class)); + String sql = sqlGenerator.createDeleteByPath(getPath("ref")); assertThat(sql).isEqualTo("DELETE FROM referenced_entity WHERE dummy_entity = :rootId"); } @@ -95,7 +95,7 @@ public class SqlGeneratorUnitTests { @Test // DATAJDBC-112 public void cascadingDeleteAllSecondLevel() { - String sql = sqlGenerator.createDeleteByPath(getPath("ref.further", DummyEntity.class)); + String sql = sqlGenerator.createDeleteByPath(getPath("ref.further")); assertThat(sql).isEqualTo( "DELETE FROM second_level_referenced_entity WHERE referenced_entity IN (SELECT x_l1id FROM referenced_entity WHERE dummy_entity = :rootId)"); @@ -112,7 +112,7 @@ public class SqlGeneratorUnitTests { @Test // DATAJDBC-112 public void cascadingDeleteAllFirstLevel() { - String sql = sqlGenerator.createDeleteAllSql(getPath("ref", DummyEntity.class)); + String sql = sqlGenerator.createDeleteAllSql(getPath("ref")); assertThat(sql).isEqualTo("DELETE FROM referenced_entity WHERE dummy_entity IS NOT NULL"); } @@ -120,7 +120,7 @@ public class SqlGeneratorUnitTests { @Test // DATAJDBC-112 public void cascadingDeleteSecondLevel() { - String sql = sqlGenerator.createDeleteAllSql(getPath("ref.further", DummyEntity.class)); + String sql = sqlGenerator.createDeleteAllSql(getPath("ref.further")); assertThat(sql).isEqualTo( "DELETE FROM second_level_referenced_entity WHERE referenced_entity IN (SELECT x_l1id FROM referenced_entity WHERE dummy_entity IS NOT NULL)"); @@ -129,7 +129,7 @@ public class SqlGeneratorUnitTests { @Test // DATAJDBC-227 public void deleteAllMap() { - String sql = sqlGenerator.createDeleteAllSql(getPath("mappedElements", DummyEntity.class)); + String sql = sqlGenerator.createDeleteAllSql(getPath("mappedElements")); assertThat(sql).isEqualTo("DELETE FROM element WHERE dummy_entity IS NOT NULL"); } @@ -137,7 +137,7 @@ public class SqlGeneratorUnitTests { @Test // DATAJDBC-227 public void deleteMapByPath() { - String sql = sqlGenerator.createDeleteByPath(getPath("mappedElements", DummyEntity.class)); + String sql = sqlGenerator.createDeleteByPath(getPath("mappedElements")); assertThat(sql).isEqualTo("DELETE FROM element WHERE dummy_entity = :rootId"); } @@ -177,7 +177,7 @@ public class SqlGeneratorUnitTests { @Test(expected = IllegalArgumentException.class) // DATAJDBC-130 public void findAllByPropertyOrderedWithoutKey() { - String sql = sqlGenerator.getFindAllByProperty("back-ref", null, true); + sqlGenerator.getFindAllByProperty("back-ref", null, true); } @Test // DATAJDBC-131, DATAJDBC-111 @@ -209,6 +209,7 @@ public class SqlGeneratorUnitTests { @Test // DATAJDBC-334 public void getInsertForQuotedColumnName() { + SqlGenerator sqlGenerator = createSqlGenerator(EntityWithQuotedColumnName.class); String insert = sqlGenerator.getInsert(emptySet()); @@ -254,6 +255,7 @@ public class SqlGeneratorUnitTests { @Test // DATAJDBC-334 public void getUpdateForQuotedColumnName() { + SqlGenerator sqlGenerator = createSqlGenerator(EntityWithQuotedColumnName.class); String update = sqlGenerator.getUpdate(); @@ -332,8 +334,8 @@ public class SqlGeneratorUnitTests { ); } - private PersistentPropertyPath getPath(String path, Class base) { - return PersistentPropertyPathTestUtils.getPath(context, path, base); + private PersistentPropertyPath getPath(String path) { + return PersistentPropertyPathTestUtils.getPath(context, path, DummyEntity.class); } @SuppressWarnings("unused") @@ -368,7 +370,9 @@ public class SqlGeneratorUnitTests { String content; } + @SuppressWarnings("unused") static class ParentOfNoIdChild { + @Id Long id; NoIdChild child; } @@ -395,6 +399,7 @@ public class SqlGeneratorUnitTests { @Id Long id; } + @SuppressWarnings("unused") static class EntityWithReadOnlyProperty { @Id Long id; @@ -403,6 +408,7 @@ public class SqlGeneratorUnitTests { } static class EntityWithQuotedColumnName { + @Id @Column("\"test_@id\"") Long id; @Column("\"test_@123\"") String name; }