diff options
| author | Ben Woosley <ben.woosley@gmail.com> | 2013-07-20 20:15:48 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-24 13:20:30 -0300 |
| commit | b4dea61a428e28da1f27630c01b2ee40bd6294b3 (patch) | |
| tree | abde35673b20ee102828a046acd20e4cb03ce992 /activerecord | |
| parent | 33e1604b3e9d7c99f9e3b0988248acc46e626f34 (diff) | |
| download | rails-b4dea61a428e28da1f27630c01b2ee40bd6294b3.tar.gz rails-b4dea61a428e28da1f27630c01b2ee40bd6294b3.tar.bz2 rails-b4dea61a428e28da1f27630c01b2ee40bd6294b3.zip | |
Tidy up the "Specified column type for quote_value" changes
This includes fixing typos in changelog, removing a deprecated
mocha/setup test require, and preferring the `column_for_attribute`
accessor over direct access to the columns_hash in the new code.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/locking/optimistic.rb
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' |