Skip to content
This repository
Browse code

Revert "Merge pull request #11299 from arunagw/disable_implicit_join_…

…references_removed"

`disable_implicit_join_references=` was only deprecated on `master`,
not with rails 4.0. We can remove it after 4.1

This reverts commit 3c719ea, reversing
changes made to d5c3bf9.
  • Loading branch information...
commit b54ef7ebdeeb0463e3348001d3d16b39a7e09506 1 parent 5ade0dd
Yves Senn authored July 05, 2013
4  activerecord/CHANGELOG.md
Source Rendered
... ...
@@ -1,7 +1,3 @@
1  
-*   Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`.
2  
-
3  
-    *Arun Agrawal*
4  
-
5 1
 *   Remove deprecated nil-passing to the following `SchemaCache` methods:
6 2
     `primary_keys`, `tables`, `columns` and `columns_hash`.
7 3
 
5  activerecord/lib/active_record/core.rb
@@ -69,6 +69,11 @@ module Core
69 69
       mattr_accessor :timestamped_migrations, instance_writer: false
70 70
       self.timestamped_migrations = true
71 71
 
  72
+      def self.disable_implicit_join_references=(value)
  73
+        ActiveSupport::Deprecation.warn("Implicit join references were removed with Rails 4.1." \
  74
+                                        "Make sure to remove this configuration because it does nothing.")
  75
+      end
  76
+
72 77
       class_attribute :default_connection_handler, instance_writer: false
73 78
 
74 79
       def self.connection_handler
6  activerecord/test/cases/relations_test.rb
@@ -1216,6 +1216,12 @@ def test_primary_key
1216 1216
     assert_equal "id", Post.all.primary_key
1217 1217
   end
1218 1218
 
  1219
+  def test_disable_implicit_join_references_is_deprecated
  1220
+    assert_deprecated do
  1221
+      ActiveRecord::Base.disable_implicit_join_references = true
  1222
+    end
  1223
+  end
  1224
+
1219 1225
   def test_ordering_with_extra_spaces
1220 1226
     assert_equal authors(:david), Author.order('id DESC , name DESC').last
1221 1227
   end

0 notes on commit b54ef7e

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