diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-10 14:49:40 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-10 14:49:40 -0300 |
commit | 63e7f07d0da869beabb7f9819e74def8d9689ce4 (patch) | |
tree | a284698ae0cc398864470914809a767383797643 | |
parent | 3681e1ac2c5448b9826f2e3c9b6508c50d2b4f17 (diff) | |
parent | bd43203deff9a74936b0eb4dabf05eb294915d60 (diff) | |
download | rails-63e7f07d0da869beabb7f9819e74def8d9689ce4.tar.gz rails-63e7f07d0da869beabb7f9819e74def8d9689ce4.tar.bz2 rails-63e7f07d0da869beabb7f9819e74def8d9689ce4.zip |
Merge pull request #15612 from akshay-vishnoi/delete-deprecated-method
Remove deprecated method ActiveRecord::Base.quoted_locking_column
-rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
-rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 6 | ||||
-rw-r--r-- | activerecord/test/cases/locking_test.rb | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index f6f7de7fbc..7839f7544b 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -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. diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index f7ceff7469..4528d8783c 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -151,12 +151,6 @@ module ActiveRecord @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 diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index 93fd3b9605..c221430757 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -272,10 +272,6 @@ class OptimisticLockingTest < ActiveRecord::TestCase 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 |