diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-01-29 07:40:52 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-01-29 07:40:52 -0800 |
| commit | 40e7fe3451df8e5b454f7d0472396d2429edc0e5 (patch) | |
| tree | 7f63409243031eaaea72dad8b32ab1f980238a64 /activerecord/CHANGELOG.md | |
| parent | f142527eb30626904cb1e655a1a28801f08b8acf (diff) | |
| parent | 66e533f9b13f2ea1f56a19246af55621cc368489 (diff) | |
| download | rails-40e7fe3451df8e5b454f7d0472396d2429edc0e5.tar.gz rails-40e7fe3451df8e5b454f7d0472396d2429edc0e5.tar.bz2 rails-40e7fe3451df8e5b454f7d0472396d2429edc0e5.zip | |
Merge pull request #13868 from mauricio/bug-13788
Correctly send the string given to lock! and reload(:lock) to the lock scope - fixes #13788
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 2e103ba354..ddf5592a78 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,13 @@ +* Correctly send an user provided statement to a `lock!()` call. + + person.lock! 'FOR SHARE NOWAIT' + # Before: SELECT * ... LIMIT 1 FOR UPDATE + # After: SELECT * ... LIMIT 1 FOR SHARE NOWAIT + + Fixes #13788. + + *Maurício Linhares* + * Handle aliased attributes `select()`, `order()` and `reorder()`. *Tsutomu Kuroda* |