aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/scoping/named.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb
index c7c3ee2b06..20c8e4b0f7 100644
--- a/activerecord/lib/active_record/scoping/named.rb
+++ b/activerecord/lib/active_record/scoping/named.rb
@@ -172,10 +172,9 @@ module ActiveRecord
# Article.featured.titles
def scope(name, scope_options = {})
- valid_scope_name?(name)
extension = Module.new(&Proc.new) if block_given?
- singleton_class.send(:redefine_method, name) do |*args|
+ singleton_class.send(:define_method, name) do |*args|
options = scope_options.respond_to?(:call) ? unscoped { scope_options.call(*args) } : scope_options
options = scoped.apply_finder_options(options) if options.is_a?(Hash)
@@ -184,15 +183,6 @@ module ActiveRecord
extension ? relation.extending(extension) : relation
end
end
-
- protected
-
- def valid_scope_name?(name)
- if respond_to?(name, true)
- logger.warn "Creating scope :#{name}. " \
- "Overwriting existing method #{self.name}.#{name}."
- end
- end
end
end
end