Permalink
Browse files

Merge pull request #11423 from kennyj/remove_quoted_locking_column

Remove unused quoted_locking_column method.
  • Loading branch information...
2 parents 8640fb8 + bb54fcd commit e029e0267206c603503db06eb48a0bbc3b2ed609 @rafaelfranca rafaelfranca committed Sep 24, 2013
View
4 activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Deprecate `quoted_locking_column` method, which isn't used anywhere.
+
+ *kennyj*
+
* Migration dump UUID default functions to schema.rb.
Fixes #10751.
View
1 activerecord/lib/active_record/locking/optimistic.rb
@@ -150,6 +150,7 @@ def locking_column
# 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
View
4 activerecord/test/cases/locking_test.rb
@@ -272,6 +272,10 @@ 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 e029e02

Please sign in to comment.