Browse Source

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

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.
2.3.x
Daniil Razorenov 4 years ago committed by Jens Schauder
parent
commit
53c9709106
No known key found for this signature in database
GPG Key ID: 45CC872F17423DBF
  1. 5
      spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/PersistentPropertyPathExtensionUnitTests.java
  2. 8
      spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithReferenceIntegrationTests.java
  3. 8
      spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/PersistentPropertyPathExtension.java

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 Jens Schauder
* @author Daniil Razorenov
*/ */
public class PersistentPropertyPathExtensionUnitTests { 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.third.value").getTableAlias()).isEqualTo(quoted("secondList_third"));
softly.assertThat(extPath("secondList").getTableAlias()).isEqualTo(quoted("secondList")); softly.assertThat(extPath("secondList").getTableAlias()).isEqualTo(quoted("secondList"));
softly.assertThat(extPath("second2.third").getTableAlias()).isEqualTo(quoted("secthird")); 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; @Id Long entityId;
Second second; Second second;
@Embedded(onEmpty = OnEmpty.USE_NULL, prefix = "sec") Second second2; @Embedded(onEmpty = OnEmpty.USE_NULL, prefix = "sec") Second second2;
@Embedded(onEmpty = OnEmpty.USE_NULL) Second second3;
List<Second> secondList; List<Second> secondList;
WithId withId; WithId withId;
} }

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

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

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

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

Loading…
Cancel
Save