From 5ddc9049416e8b6093a7bb3ad4341694f7a14d9f Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Mon, 17 May 2010 15:41:22 +0100 Subject: Remove Model.clear_default_scope --- activerecord/lib/active_record/base.rb | 4 ---- activerecord/test/cases/method_scoping_test.rb | 12 ------------ 2 files changed, 16 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 18f75af11b..1b76f357e3 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1193,10 +1193,6 @@ module ActiveRecord #:nodoc: self.default_scoping << construct_finder_arel(options, default_scoping.pop) end - def clear_default_scope - self.default_scoping.clear - end - def scoped_methods #:nodoc: key = :"#{self}_scoped_methods" Thread.current[key] = Thread.current[key].presence || self.default_scoping.dup diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb index 3a6354ec6d..cb599e363f 100644 --- a/activerecord/test/cases/method_scoping_test.rb +++ b/activerecord/test/cases/method_scoping_test.rb @@ -587,18 +587,6 @@ class HasAndBelongsToManyScopingTest< ActiveRecord::TestCase end end -class ClearDefaultScopeTest < ActiveRecord::TestCase - fixtures :developers - - def test_should_clear_default_scope - klass = Class.new(DeveloperCalledDavid) - klass.__send__ :clear_default_scope - expected = Developer.all.collect { |dev| dev.name } - actual = klass.all.collect { |dev| dev.name } - assert_equal expected, actual - end -end - class DefaultScopingTest < ActiveRecord::TestCase fixtures :developers, :posts -- cgit v1.2.3