Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit b4dea61a428e28da1f27630c01b2ee40bd6294b3 1 parent 33e1604
Ben Woosley Empact authored rafaelfranca committed
5 activerecord/CHANGELOG.md
View
@@ -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*
1  activerecord/test/cases/locking_test.rb
View
@@ -1,5 +1,4 @@
require 'thread'
-require 'mocha/setup'
require "cases/helper"
require 'models/person'
require 'models/job'
Please sign in to comment.
Something went wrong with that request. Please try again.