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

Remove external column name prefixing for embedded entities.

Browse Source 
Original pull request #1604
See #1586
This commit is contained in:
Jens Schauder
2023-09-05 16:30:14 +02:00
parent d6d99571b1
commit f60044225f
8 changed files with 21 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java
View File

@@ -413,7 +413,7 @@ public class QueryMapper {
Condition condition = null;
for (RelationalPersistentProperty nestedProperty : persistentEntity) {
SqlIdentifier sqlIdentifier = nestedProperty.getColumnName().transform(prefix::concat);
SqlIdentifier sqlIdentifier = nestedProperty.getColumnName();
Object mappedNestedValue = convertValue(embeddedAccessor.getProperty(nestedProperty),
nestedProperty.getTypeInformation());
SQLType sqlType = converter.getTargetSqlType(nestedProperty);
@@ -768,16 +768,6 @@ public class QueryMapper {
throw new IllegalStateException("Cannot obtain a single column name for embedded property");
}
if (this.property != null && this.path != null && this.path.getParentPath() != null) {
RelationalPersistentProperty owner = this.path.getParentPath().getLeafProperty();
if (owner != null && owner.isEmbedded()) {
return this.property.getColumnName()
.transform(it -> Objects.requireNonNull(owner.getEmbeddedPrefix()).concat(it));
}
}
return this.path == null || this.path.getLeafProperty() == null ? super.getMappedColumnName()
: this.path.getLeafProperty().getColumnName();
}

5
spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/AggregatePath.java
View File

@@ -334,9 +334,8 @@ public interface AggregatePath extends Iterable<AggregatePath> {
// TODO: Multi-valued paths cannot be represented with a single column
// Assert.isTrue(!path.isMultiValued(), () -> "Cannot obtain ColumnInfo for multi-valued path");
SqlIdentifier name = AggregatePathTableUtils.assembleColumnName(path,
path.getRequiredLeafProperty().getColumnName());
return new ColumnInfo(name, AggregatePathTableUtils.prefixWithTableAlias(path, name));
SqlIdentifier columnName = path.getRequiredLeafProperty().getColumnName();
return new ColumnInfo(columnName, AggregatePathTableUtils.prefixWithTableAlias(path, columnName));
}
}
}

12
spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/AggregatePathTableUtils.java
View File

@@ -33,18 +33,6 @@ import org.springframework.data.relational.core.sql.SqlIdentifier;
*/
class AggregatePathTableUtils {
public static SqlIdentifier assembleColumnName(AggregatePath path, SqlIdentifier suffix) {
return suffix.transform(constructEmbeddedPrefix(path)::concat);
}
private static String constructEmbeddedPrefix(AggregatePath path) {
return path.stream() //
.filter(p -> p != path) //
.takeWhile(AggregatePath::isEmbedded).map(p -> p.getRequiredLeafProperty().getEmbeddedPrefix()) //
.collect(new ReverseJoinCollector());
}
public static SqlIdentifier prefixWithTableAlias(AggregatePath path, SqlIdentifier columnName) {
AggregatePath tableOwner = AggregatePathTraversal.getTableOwningPath(path);

4
spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/AggregatePathTraversal.java
View File

@@ -37,9 +37,9 @@ public class AggregatePathTraversal {
public static AggregatePath getTableOwningPath(AggregatePath aggregatePath) {
Predicate<AggregatePath> idDefiningPathFilter = ap -> ap.isEntity() && !ap.isEmbedded();
Predicate<AggregatePath> tableOwningPathFilter = ap -> ap.isEntity() && !ap.isEmbedded();
AggregatePath result = aggregatePath.filter(idDefiningPathFilter);
AggregatePath result = aggregatePath.filter(tableOwningPathFilter);
if (result == null) {
throw new NoSuchElementException();
}

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

@@ -32,8 +32,12 @@ record EmbeddedContext(RelationalPersistentProperty ownerProperty) {
public String withEmbeddedPrefix(String name) {
if (ownerProperty.getEmbeddedPrefix() != null) {
return ownerProperty.getEmbeddedPrefix() + name;
if (!ownerProperty.isEmbedded()) {
return name;
}
String embeddedPrefix = ownerProperty.getEmbeddedPrefix();
if (embeddedPrefix != null) {
return embeddedPrefix + name;
}
return name;

5
spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/EmbeddedRelationalPersistentProperty.java
View File

@@ -43,6 +43,11 @@ class EmbeddedRelationalPersistentProperty implements RelationalPersistentProper
this.context = context;
}
@Override
public boolean isEmbedded() {
return delegate.isEmbedded();
}
@Nullable
@Override
public String getEmbeddedPrefix() {

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

@@ -214,7 +214,7 @@ public class PersistentPropertyPathExtension {
Assert.state(path != null, "Path is null");
return assembleColumnName(path.getLeafProperty().getColumnName());
return path.getLeafProperty().getColumnName();
}
/**
@@ -451,26 +451,6 @@ public class PersistentPropertyPathExtension {
}
private SqlIdentifier assembleColumnName(SqlIdentifier suffix) {
Assert.state(path != null, "Path is null");
if (path.getLength() <= 1) {
return suffix;
}
PersistentPropertyPath<? extends RelationalPersistentProperty> parentPath = path.getParentPath();
RelationalPersistentProperty parentLeaf = parentPath.getLeafProperty();
if (!parentLeaf.isEmbedded()) {
return suffix;
}
String embeddedPrefix = parentLeaf.getEmbeddedPrefix();
return getParentPath().assembleColumnName(suffix.transform(embeddedPrefix::concat));
}
private SqlIdentifier prefixWithTableAlias(SqlIdentifier columnName) {
SqlIdentifier tableAlias = getTableAlias();

6
spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/DefaultAggregatePathUnitTests.java
View File

@@ -200,6 +200,7 @@ class DefaultAggregatePathUnitTests {
softly.assertThat(path().isEmbedded()).isFalse();
softly.assertThat(path("withId").isEmbedded()).isFalse();
softly.assertThat(path("second2.third").isEmbedded()).isFalse();
softly.assertThat(path("second2.third2").isEmbedded()).isTrue();
softly.assertThat(path("second2").isEmbedded()).isTrue();
});
@@ -390,8 +391,9 @@ class DefaultAggregatePathUnitTests {
assertSoftly(softly -> {
softly.assertThat(path("second.third2.value").getRequiredLeafProperty())
.isEqualTo(context.getRequiredPersistentEntity(Third.class).getPersistentProperty("value"));
RelationalPersistentProperty prop = path("second.third2.value").getRequiredLeafProperty();
softly.assertThat(prop.getName()).isEqualTo("value");
softly.assertThat(prop.getOwner().getType()).isEqualTo(Third.class);
softly.assertThat(path("second.third").getRequiredLeafProperty())
.isEqualTo(context.getRequiredPersistentEntity(Second.class).getPersistentProperty("third"));
softly.assertThat(path("secondList").getRequiredLeafProperty())