Skip to content
Browse files

Merge pull request #11299 from arunagw/disable_implicit_join_referenc…

…es_removed

Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`
  • Loading branch information...
2 parents d5c3bf9 + 6dd7f7c commit 3c719ead414ffd29e71efce185698af979052abb @carlosantoniodasilva carlosantoniodasilva committed Jul 4, 2013
Showing with 4 additions and 11 deletions.
  1. +4 −0 activerecord/CHANGELOG.md
  2. +0 −5 activerecord/lib/active_record/core.rb
  3. +0 −6 activerecord/test/cases/relations_test.rb
View
4 activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`.
+
+ *Arun Agrawal*
+
* Remove deprecated nil-passing to the following `SchemaCache` methods:
`primary_keys`, `tables`, `columns` and `columns_hash`.
View
5 activerecord/lib/active_record/core.rb
@@ -69,11 +69,6 @@ module Core
mattr_accessor :timestamped_migrations, instance_writer: false
self.timestamped_migrations = true
- def self.disable_implicit_join_references=(value)
- ActiveSupport::Deprecation.warn("Implicit join references were removed with Rails 4.1." \
- "Make sure to remove this configuration because it does nothing.")
- end
-
class_attribute :default_connection_handler, instance_writer: false
def self.connection_handler
View
6 activerecord/test/cases/relations_test.rb
@@ -1216,12 +1216,6 @@ def test_primary_key
assert_equal "id", Post.all.primary_key
end
- def test_disable_implicit_join_references_is_deprecated
- assert_deprecated do
- ActiveRecord::Base.disable_implicit_join_references = true
- end
- end
-
def test_ordering_with_extra_spaces
assert_equal authors(:david), Author.order('id DESC , name DESC').last
end

0 comments on commit 3c719ea

Please sign in to comment.
Something went wrong with that request. Please try again.