[#1504] Merge with reference fails if entity is associated to a column (non id) #1685
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| String uniqueKeyPropertyName = entityType.getRHSUniqueKeyPropertyName(); | ||
| Object propertyValue = entityPersister.getPropertyValue( value, uniqueKeyPropertyName ); | ||
| // We now have the value of the property-ref we reference. However, | ||
| // we need to dig a little deeper, as that property might also be | ||
| // an entity type, in which case we need to resolve its identifier | ||
| Type type = entityPersister.getPropertyType( uniqueKeyPropertyName ); | ||
| final Type type = entityPersister.getPropertyType( uniqueKeyPropertyName ); |
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation
| // We now have the value of the property-ref we reference. However, | ||
| // we need to dig a little deeper, as that property might also be | ||
| // an entity type, in which case we need to resolve its identifier | ||
| final Type type = entityPersister.getPropertyType( uniqueKeyPropertyName ); |
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation
DavideD
reviewed
Jun 28, 2023
| session | ||
| ); | ||
| loadedUniqueKey = ((CompletableFuture)resultObject).get(); | ||
| } |
There was a problem hiding this comment.
You should not use a .get() because it's a blocking method.
Assuming the logic is correct (I haven't cheked yet), the code should look something like:
.thenCompose ukResult -> {
...
if ( loadedUniqueKey instanceof HibernateProxy ) {
return loadHibernateProxyEntity( ... )
.thenApply(loadedUniqueKey -> { .... } );
}
...
}
blafond
force-pushed
the
1504-merge-reference
branch
from
42cd05f to
d840f80
Compare
|
Thanks, looks good. I've just decided to keep the original tests and took the opportunity to clean up a bit the code and remove some warnings in EntityTypes: #1696 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #1504
The two tests were failing because the
Barentity column was still aHibernateProxyobject inEntityTypesmethods so the identifierBar.keyvalue was always null.The fixes I implemented check for the proxy and force a load via
reactiveImmediateLoad()