From 6dd7f7c04edeeb97f5dfa8cdcfdcf13eb503f277 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Thu, 4 Jul 2013 19:48:42 +0200 Subject: Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`. --- activerecord/CHANGELOG.md | 4 ++++ activerecord/lib/active_record/core.rb | 5 ----- activerecord/test/cases/relations_test.rb | 6 ------ 3 files changed, 4 insertions(+), 11 deletions(-) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index f59f79112e..12c5ea7adc 100644 --- a/activerecord/CHANGELOG.md +++ b/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`. diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index c6b7da2e3c..45239c2f79 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -69,11 +69,6 @@ module ActiveRecord 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 diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index b205472cf5..ac769ea90a 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -1216,12 +1216,6 @@ class RelationTest < ActiveRecord::TestCase 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 -- cgit v1.2.3