Permalink
Browse files

Remove deprecated method ActiveRecord::Base.quoted_locking_column

  • Loading branch information...
1 parent 4d209b5 commit bd43203deff9a74936b0eb4dabf05eb294915d60 Akshay Vishnoi committed Jun 10, 2014
@@ -1,3 +1,7 @@
+* Remove deprecated method `ActiveRecord::Base.quoted_locking_column`.
+
+ *Akshay Vishnoi*
+
* `ActiveRecord::FinderMethods.find` with block can handle proc parameter as
`Enumerable#find` does.
@@ -151,12 +151,6 @@ def locking_column
@locking_column
end
- # Quote the column name used for optimistic locking.
- def quoted_locking_column
- ActiveSupport::Deprecation.warn "ActiveRecord::Base.quoted_locking_column is deprecated and will be removed in Rails 4.2 or later."
- connection.quote_column_name(locking_column)
- end
-
# Reset the column used for optimistic locking back to the +lock_version+ default.
def reset_locking_column
self.locking_column = DEFAULT_LOCKING_COLUMN
@@ -272,10 +272,6 @@ def test_removing_has_and_belongs_to_many_associations_upon_destroy
assert p.treasures.empty?
assert RichPerson.connection.select_all("SELECT * FROM peoples_treasures WHERE rich_person_id = 1").empty?
end
-
- def test_quoted_locking_column_is_deprecated
- assert_deprecated { ActiveRecord::Base.quoted_locking_column }
- end
end
class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase

0 comments on commit bd43203

Please sign in to comment.