Fix RunAndReturn methods returning stale tracked entity values#189
Merged
artiomchi merged 6 commits intoartiomchi:mainfrom Dec 23, 2025
Merged
Conversation
When RunAndReturn/RunAndReturnAsync are called and entities are already being tracked by the DbContext, EF Core was returning the stale tracked values instead of fresh values from the database. This was especially problematic when using WhenMatched expressions with calculations like existing.Balance + inserted.Balance. Changes: - Added .AsNoTracking() to both RunAndReturn() and RunAndReturnAsync() to ensure fresh database values are queried - Added AttachOrUpdateEntities() helper method to handle entity tracking: - If entity is already tracked (by PK), updates it with fresh values - If entity is not tracked, attaches it for future tracking - This maintains backward compatibility while fixing the correctness issue - Added regression tests to verify fresh values are returned
Contributor
Author
|
I am by no stretch of the imagination thoroughly versed in EF. I readily submit that there may be much better ways of accomplishing this. |
| .On(v => new { v.UserID, v.Date }) | ||
| .WhenMatched((existing, inserted) => new PageVisit | ||
| { | ||
| Visits = existing.Visits + inserted.Visits, // 10 + 5 = 15 |
Contributor
Author
There was a problem hiding this comment.
I couldn't get changes like this to work with the existing code.
| .On(v => new { v.UserID, v.Date }) | ||
| .WhenMatched((existing, inserted) => new PageVisit | ||
| { | ||
| Visits = existing.Visits + inserted.Visits, // 10 + 5 = 15 |
Contributor
Author
There was a problem hiding this comment.
I couldn't get changes like this to work with the existing code.
Contributor
Author
|
@artiomchi - does this sound reasonable? Or is there a more appropriate means of getting fresh results for situations like shown in the tests? Thanks! |
Owner
|
Hey @sdukehart-omnesoft! Thanks for making these changes, I think they're great, and your approach looks correct to me. I've taken the liberty to make a couple small changes (slight optimisation and refactor), but otherwise this looks good to go in! |
artiomchi
approved these changes
Dec 23, 2025
This was referenced Dec 29, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When RunAndReturn/RunAndReturnAsync are called and entities are already being tracked by the DbContext, EF Core was returning the stale tracked values instead of fresh values from the database. This was especially problematic when using WhenMatched expressions with calculations like existing.Balance + inserted.Balance.
Changes: