Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-18086 Include parent alias in NP identifier for table group

This commit is contained in:
Marco Belladelli 2024-05-09 10:20:44 +02:00
parent b392a5187d
commit 6bff7d30c8
5 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hibernate-core/src/main/java/org/hibernate/spi/NavigablePath.java
View File

@ -31,7 +31,6 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
private final String localName;
private final @Nullable String alias;
private final String identifierForTableGroup;
private final FullPathCalculator fullPathCalculator;
private final int hashCode;
public NavigablePath(String localName) {
@ -44,8 +43,6 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
this.localName = rootName;
this.identifierForTableGroup = rootName;
this.fullPathCalculator = NavigablePath::calculateRootFullPath;
this.hashCode = localName.hashCode() + ( alias == null ? 0 : alias.hashCode() );
}
@ -71,17 +68,20 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
if ( IDENTIFIER_MAPPER_PROPERTY.equals( localName ) ) {
this.localName = "";
this.identifierForTableGroup = parent.getFullPath();
this.fullPathCalculator = NavigablePath::calculateIdMapperFullPath;
}
else {
this.localName = localName;
this.identifierForTableGroup = StringHelper.isEmpty( parent.getIdentifierForTableGroup() )
final String parentFullPath = parent.getFullPath();
this.identifierForTableGroup = StringHelper.isEmpty( parentFullPath )
? aliasedLocalName
: parent.getIdentifierForTableGroup() + "." + localName;
this.fullPathCalculator = NavigablePath::calculateNormalFullPath;
: parentFullPath + "." + localName;
}
}
/**
* @deprecated Since {@link FullPathCalculator} is no longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
public NavigablePath(
@Nullable NavigablePath parent,
String localName,
@ -89,12 +89,20 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
String identifierForTableGroup,
FullPathCalculator fullPathCalculator,
int hashCode) {
this( parent, localName, alias, identifierForTableGroup, hashCode );
}
public NavigablePath(
@Nullable NavigablePath parent,
String localName,
@Nullable String alias,
String identifierForTableGroup,
int hashCode) {
this.parent = parent;
this.localName = localName;
this.hashCode = hashCode;
this.alias = StringHelper.nullIfEmpty( alias );
this.identifierForTableGroup = identifierForTableGroup;
this.fullPathCalculator = fullPathCalculator;
}
@Override
@ -316,7 +324,7 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
@Override
public String getFullPath() {
return fullPathCalculator.calculateFullPath( parent, localName, alias );
return alias == null ? identifierForTableGroup : identifierForTableGroup + "(" + alias + ")";
}
@Override
@ -326,15 +334,21 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
/**
* Effectively a tri-function
*
* @deprecated No longer used
*/
@FunctionalInterface
@Deprecated( since = "6.6", forRemoval = true )
protected interface FullPathCalculator extends Serializable {
String calculateFullPath(@Nullable NavigablePath parent, String localName, @Nullable String alias);
}
/**
* The pattern used for root NavigablePaths
*
* @deprecated No longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
protected static String calculateRootFullPath(@Nullable NavigablePath parent, String rootName, @Nullable String alias) {
assert parent == null;
return alias == null ? rootName : rootName + "(" + alias + ")";
@ -342,10 +356,11 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
/**
* The normal pattern used for the "full path"
*
* @deprecated No longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
private static String calculateNormalFullPath(@Nullable NavigablePath parent, String localName, @Nullable String alias) {
assert parent != null;
final String parentFullPath = castNonNull( parent ).getFullPath();
final String baseFullPath = StringHelper.isEmpty( parentFullPath )
? localName
@ -355,7 +370,10 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
/**
* Pattern used for `_identifierMapper`
*
* @deprecated No longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
protected static String calculateIdMapperFullPath(@Nullable NavigablePath parent, String localName, @Nullable String alias) {
return parent != null ? parent.getFullPath() : "";
}

5
hibernate-core/src/main/java/org/hibernate/spi/TreatedNavigablePath.java
View File

@ -30,12 +30,15 @@ public class TreatedNavigablePath extends NavigablePath {
"#" + entityTypeName,
alias,
"treat(" + parent + " as " + entityTypeName + ")",
TreatedNavigablePath::calculateTreatedFullPath,
1
);
assert !( parent instanceof TreatedNavigablePath );
}
/**
* @deprecated No longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
protected static String calculateTreatedFullPath(@Nullable NavigablePath parent, String localName, @Nullable String alias) {
return alias == null
? "treat(" + parent + " as " + localName + ")"

5
hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableFetchImpl.java
View File

@ -35,6 +35,8 @@ import org.hibernate.sql.results.graph.embeddable.EmbeddableResultGraphNode;
import org.hibernate.sql.results.graph.embeddable.EmbeddableValuedFetchable;
import org.hibernate.type.spi.TypeConfiguration;
import static org.hibernate.internal.util.NullnessUtil.castNonNull;
/**
* A Fetch for an embeddable that is mapped as aggregate e.g. STRUCT, JSON or XML.
* This is only used when {@link EmbeddableMappingType#shouldSelectAggregateMapping()} returns <code>true</code>.
@ -143,7 +145,8 @@ public class AggregateEmbeddableFetchImpl extends AbstractFetchParent
final NavigablePath navigablePath = tableGroupJoin.getNavigablePath();
if ( tableGroupJoin.getJoinedGroup().isFetched()
&& fetchable.getFetchableName().equals( navigablePath.getLocalName() )
&& tableGroupJoin.getJoinedGroup().getModelPart() == fetchable ) {
&& tableGroupJoin.getJoinedGroup().getModelPart() == fetchable
&& castNonNull( navigablePath.getParent() ).equals( getNavigablePath() ) ) {
return navigablePath;
}
}

5
hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
View File

@ -31,6 +31,8 @@ import org.hibernate.sql.results.graph.embeddable.EmbeddableInitializer;
import org.hibernate.sql.results.graph.embeddable.EmbeddableResultGraphNode;
import org.hibernate.sql.results.graph.embeddable.EmbeddableValuedFetchable;
import static org.hibernate.internal.util.NullnessUtil.castNonNull;
/**
* @author Steve Ebersole
*/
@ -135,7 +137,8 @@ public class EmbeddableFetchImpl extends AbstractFetchParent
final NavigablePath navigablePath = tableGroupJoin.getNavigablePath();
if ( tableGroupJoin.getJoinedGroup().isFetched()
&& fetchable.getFetchableName().equals( navigablePath.getLocalName() )
&& tableGroupJoin.getJoinedGroup().getModelPart() == fetchable ) {
&& tableGroupJoin.getJoinedGroup().getModelPart() == fetchable
&& castNonNull( navigablePath.getParent() ).equals( getNavigablePath() ) ) {
return navigablePath;
}
}

5
hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java
View File

@ -22,6 +22,8 @@ import org.hibernate.sql.results.graph.InitializerProducer;
import org.hibernate.sql.results.graph.entity.AbstractEntityResultGraphNode;
import org.hibernate.sql.results.graph.entity.EntityResult;
import static org.hibernate.internal.util.NullnessUtil.castNonNull;
/**
* Standard ReturnEntity impl
*
@ -50,7 +52,8 @@ public class EntityResultImpl extends AbstractEntityResultGraphNode
final NavigablePath navigablePath = tableGroupJoin.getNavigablePath();
if ( tableGroupJoin.getJoinedGroup().isFetched()
&& fetchable.getFetchableName().equals( navigablePath.getLocalName() )
&& tableGroupJoin.getJoinedGroup().getModelPart() == fetchable ) {
&& tableGroupJoin.getJoinedGroup().getModelPart() == fetchable
&& castNonNull( navigablePath.getParent() ).equals( getNavigablePath() ) ) {
return navigablePath;
}
}