Fixing count memoization

mongoid · Nov 28, 2009 · e8aaebf · e8aaebf
1 parent b16da83
commit e8aaebf
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/mongoid/criteria.rb b/lib/mongoid/criteria.rb
@@ -31,7 +31,7 @@ def ==(other)
       when Criteria
         self.selector == other.selector && self.options == other.options
       when Enumerable
-        execute
+        @collection ||= execute
         return (@collection == other)
       else
         return false
@@ -83,7 +83,7 @@ def all(selections = {})
     def count
       return @count if @count
       @klass = klass if klass
-      return @klass.collection.find(@selector, @options.dup).count
+      @count ||= @klass.collection.find(@selector, @options.dup).count
     end
 
     # Iterate over each +Document+ in the results. This can take an optional
@@ -464,9 +464,9 @@ def execute
       attributes = @klass.collection.find(@selector, @options.dup)
       if attributes
         @count = attributes.count
-        @collection = attributes.collect { |doc| @klass.instantiate(doc) }
+        attributes.collect { |doc| @klass.instantiate(doc) }
       else
-        @collection = []
+        []
       end
     end