Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix assemble table alias for embedded entity with empty prefix and reference.

Browse Source 
Table alias for embedded entity use prefix value from Embedded annotation. But default value for prefix is empty string. If try to create SqlIdentifier for empty string it throw exception. To avoid this behavior, if prefix is an empty string, property name for embedded entity is taken instead.
This commit is contained in:
Daniil Razorenov
2022-01-29 19:37:49 +03:00
committed by Jens Schauder
parent a4d2f1ef05
commit b53e4e6091
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/PersistentPropertyPathExtensionUnitTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 the original author or authors.
* Copyright 2019-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ import org.springframework.data.relational.core.mapping.RelationalPersistentProp
/**
* @author Jens Schauder
* @author Daniil Razorenov
*/
public class PersistentPropertyPathExtensionUnitTests {
@@ -126,6 +127,7 @@ public class PersistentPropertyPathExtensionUnitTests {
softly.assertThat(extPath("secondList.third.value").getTableAlias()).isEqualTo(quoted("secondList_third"));
softly.assertThat(extPath("secondList").getTableAlias()).isEqualTo(quoted("secondList"));
softly.assertThat(extPath("second2.third").getTableAlias()).isEqualTo(quoted("secthird"));
softly.assertThat(extPath("second3.third").getTableAlias()).isEqualTo(quoted("second3third"));
});
}
@@ -237,6 +239,7 @@ public class PersistentPropertyPathExtensionUnitTests {
@Id Long entityId;
Second second;
@Embedded(onEmpty = OnEmpty.USE_NULL, prefix = "sec") Second second2;
@Embedded(onEmpty = OnEmpty.USE_NULL) Second second3;
List<Second> secondList;
WithId withId;
}

8
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithReferenceIntegrationTests.java
View File

@@ -277,6 +277,8 @@ public class JdbcRepositoryEmbeddedWithReferenceIntegrationTests {
String test;
@Embedded(onEmpty = OnEmpty.USE_NULL, prefix = "PREFIX_") Embeddable embeddable;
@Embedded(onEmpty = OnEmpty.USE_NULL) Embeddable2 embeddable2;
}
@Data
@@ -287,6 +289,12 @@ public class JdbcRepositoryEmbeddedWithReferenceIntegrationTests {
String test;
}
@Data
private static class Embeddable2 {
@Column("ID") DummyEntity2 dummyEntity2;
}
@Data
private static class DummyEntity2 {

8
spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/PersistentPropertyPathExtension.java
View File

@@ -31,6 +31,7 @@ import java.util.Objects;
* available used in SQL generation and conversion
*
* @author Jens Schauder
* @author Daniil Razorenov
* @since 1.1
*/
public class PersistentPropertyPathExtension {
@@ -389,7 +390,12 @@ public class PersistentPropertyPathExtension {
Assert.state(path != null, "Path is null");
RelationalPersistentProperty leafProperty = path.getRequiredLeafProperty();
String prefix = isEmbedded() ? leafProperty.getEmbeddedPrefix() : leafProperty.getName();
String prefix;
if (isEmbedded() && (leafProperty.getEmbeddedPrefix() == null || !leafProperty.getEmbeddedPrefix().isEmpty())) {
prefix = leafProperty.getEmbeddedPrefix();
} else {
prefix = leafProperty.getName();
}
if (path.getLength() == 1) {
Assert.notNull(prefix, "Prefix mus not be null.");