aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-10 14:49:40 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-10 14:49:40 -0300
commit63e7f07d0da869beabb7f9819e74def8d9689ce4 (patch)
treea284698ae0cc398864470914809a767383797643 /activerecord/lib
parent3681e1ac2c5448b9826f2e3c9b6508c50d2b4f17 (diff)
parentbd43203deff9a74936b0eb4dabf05eb294915d60 (diff)
downloadrails-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
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/locking/optimistic.rb6
1 files changed, 0 insertions, 6 deletions
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