From b0967cc5cf5ce08e7fb0574692e3bb785e79973a Mon Sep 17 00:00:00 2001
From: Matthew Rudy Jacobs <matthewrudyjacobs@gmail.com>
Date: Tue, 2 Mar 2010 11:24:35 +0800
Subject: [PATCH] defining a named_scope which overwrites an existing method is
 now allowed we just log a warning.

This was motivated by the fact that :open is defined on all classes
as such the named_scope "open" can never be used, without hacking
ActiveRecord with an "undef_method" [#4083 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/named_scope.rb |  3 ++-
 activerecord/test/cases/named_scope_test.rb   | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index 11c21a9207d93..aac00cc54aa20 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -102,7 +102,8 @@ def scope(name, options = {}, &block)
         name = name.to_sym
 
         if !scopes[name] && respond_to?(name, true)
-          raise ArgumentError, "Cannot define scope :#{name} because #{self.name}.#{name} method already exists."
+          logger.warn "Creating scope :#{name}. " \
+                      "Overwriting existing method #{self.name}.#{name}."
         end
 
         scopes[name] = lambda do |parent_scope, *args|
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 6c2b4fa3a77f3..40c724b87e836 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -371,8 +371,21 @@ def test_table_names_for_chaining_scopes_with_and_without_table_name_included
   end
 
   def test_named_scopes_with_reserved_names
-    [:where, :with_scope].each do |protected_method|
-      assert_raises(ArgumentError) { Topic.scope protected_method }
+    class << Topic
+      def public_method; end
+      public :public_method
+      
+      def protected_method; end
+      protected :protected_method
+      
+      def private_method; end
+      private :private_method
+    end
+    
+    [:public_method, :protected_method, :private_method].each do |reserved_method|
+      assert Topic.respond_to?(reserved_method, true)
+      ActiveRecord::Base.logger.expects(:warn)
+      Topic.scope(reserved_method)
     end
   end