aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/named_scope.rb
diff options
context:
space:
mode:
authorTarmo Tänav <tarmo@itech.ee>2008-06-13 23:39:10 +0300
committerJeremy Kemper <jeremy@bitsweat.net>2008-06-22 17:26:00 -0700
commit1afae84ab2656cd58a861ab4a4b1745d80088d0f (patch)
tree29544057e3738abdc680d795aa8fe49ebdf1176b /activerecord/lib/active_record/named_scope.rb
parent43cbcb10ae85adc4403e950e69ee14123a20d8ae (diff)
downloadrails-1afae84ab2656cd58a861ab4a4b1745d80088d0f.tar.gz
rails-1afae84ab2656cd58a861ab4a4b1745d80088d0f.tar.bz2
rails-1afae84ab2656cd58a861ab4a4b1745d80088d0f.zip
Fixed that scopes defined with a string name could not be composed
Diffstat (limited to 'activerecord/lib/active_record/named_scope.rb')
-rw-r--r--activerecord/lib/active_record/named_scope.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index b0c8a8b815..eac61e9e43 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -82,6 +82,7 @@ module ActiveRecord
# expected_options = { :conditions => { :colored => 'red' } }
# assert_equal expected_options, Shirt.colored('red').proxy_options
def named_scope(name, options = {}, &block)
+ name = name.to_sym
scopes[name] = lambda do |parent_scope, *args|
Scope.new(parent_scope, case options
when Hash