fix: attach FOR NO KEY UPDATE lock to query if required #8008
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
FOR NO KEY UPDATE was introduced in typeorm 0.2.25 but the relevant query part was never added due to missing check in FindOptionUtils Closes: typeorm#7717
| @@ -155,7 +155,14 @@ export class FindOptionsUtils { | |||
| if (options.lock) { | |||
| if (options.lock.mode === "optimistic") { | |||
| qb.setLock(options.lock.mode, options.lock.version); | |||
| } else if (options.lock.mode === "pessimistic_read" || options.lock.mode === "pessimistic_write" || options.lock.mode === "dirty_read" || options.lock.mode === "pessimistic_partial_write" || options.lock.mode === "pessimistic_write_or_fail") { | |||
| } else if ( | |||
| options.lock.mode === "pessimistic_read" || | |||
There was a problem hiding this comment.
Is it better to store all possible locks in const array and call array.includes() instead of chaining equality checks.
There was a problem hiding this comment.
Absolutely. The locking code base seems to have grown a lot in the past and needs some refactoring. I would like to create a separate PR for cleaning up. This is to be understood as a "hot fix" as the refactoring will need a bit of time.
|
Is there a way to re-trigger the circleci test for cockroachdb? It seems it may just hung up. Not quite familiar with cockroachdb... |
|
Thank you for contribution! 🎉 |
HeartPattern
pushed a commit
to HeartPattern/typeorm
that referenced
this pull request
Nov 29, 2021
FOR NO KEY UPDATE was introduced in typeorm 0.2.25 but the relevant query part was never added due to missing check in FindOptionUtils Closes: typeorm#7717
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.
Description of change
FOR NO KEY UPDATE was introduced in typeorm 0.2.25 but the relevant query
part was never added due to missing check in FindOptionUtils as @ykovalenko-gentech
stated out. I've added a test to ensure this behaviour will not change in the future.
Fixes #7717
Pull-Request Checklist
masterbranchnpm run lintpasses with this changenpm run testpasses with this changeFixes #0000