diff options
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/CHANGELOG.md | 5 | ||||
-rw-r--r-- | activerecord/test/cases/locking_test.rb | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 8ea8d90305..a068d04fbd 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,9 +1,10 @@ ## unreleased ## -* When using optimisitc locking, `update` whas not passing the column type to `quote_value` +* When using optimistic locking, `update` was not passing the column to `quote_value` to allow the connection adapter to properly determine how to quote the value. This was affecting certain databases that use specific colmn types. - Fix #6763 + + Fixes: #6763 *Alfred Wong* diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index bd57943eac..d15f1fb8fb 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -1,5 +1,4 @@ require 'thread' -require 'mocha/setup' require "cases/helper" require 'models/person' require 'models/job' |