Ticket #9923: lazyattr.diff

test/associations/lazy_association_test.rb

@@ +1 @@
+require 'abstract_unit'
+require 'fixtures/post'
+require 'fixtures/comment'
+require 'fixtures/author'
+require 'fixtures/category'
+require 'fixtures/categorization'
+require 'fixtures/company'
+require 'fixtures/topic'
+require 'fixtures/reply'
+
+class LazyAssociationTest < Test::Unit::TestCase
+  fixtures :authors, :mixins, :companies, :posts, :topics
+
+  def test_lazy_association_loading
+    authors = Author.find(:all, :include=> :posts, :conditions => ['posts.type = ?', "Post"])
+    assert_not_equal(0 , authors.length)
+    authors.each { |author| 
+      assert author.send(:instance_variables).include? "@posts" }
+    authors = Author.find(:all, :include=> :posts, :lazy_associations => true, :conditions => ['posts.type = ?', "Post"])
+    assert_not_equal(0 , authors.length)
+    #    authors.each { |author| assert_queries {author.posts} }
+    authors.each { |author|
+       assert !(author.send(:instance_variables).include? "@posts") }
+  end 
+end
+

lib/active_record/associations.rb

@@ -1115 +1115 @@
-        
-        def find_with_associations(options = {})
-          catch :invalid_query do
-
+, options[:lazy_associations]
-            rows = select_all_rows(options, join_dependency)
-            return join_dependency.instantiate(rows)
-          end
@@ -1369 +1369 @@
-        class JoinDependency # :nodoc:
-          attr_reader :joins, :reflections, :table_aliases
-
-
+, lazy_associations = false
-            @joins                 = [JoinBase.new(base, joins)]
-            @associations          = associations
+            @lazy_associations = lazy_associations 
-            @reflections           = []
-            @base_records_hash     = {}
-            @base_records_in_order = []
@@ -1394 +1395 @@
-              unless @base_records_hash[primary_id]
-                @base_records_in_order << (@base_records_hash[primary_id] = join_base.instantiate(row))
-              end
-
+  unless @lazy_associations
-            end
-            return @base_records_in_order
-          end

lib/active_record/base.rb

@@ -392 +392 @@
-      # * <tt>:readonly</tt>: Mark the returned records read-only so they cannot be saved or updated.
-      # * <tt>:lock</tt>: An SQL fragment like "FOR UPDATE" or "LOCK IN SHARE MODE".
-      #   :lock => true gives connection's default exclusive lock, usually "FOR UPDATE".
+      # * <tt>:lazy_associations</tt> A boolean value, default is false.  Normally when the :include option is used to add associated 
+      #    tables to the query, the cooresponding association collections will be created.  This is normally desired, but it may
+      #    result unnecessary processing and memory usage when the inclusion is solely to aid in selecting base records.
+      #    If lazy_associations is true then the tables for any associations will participate in the sql query so that their fields can
+      #    be used in the :conditions option, but the association collection will not be created by find.
-      #
-      # Examples for find by id:
-      #   Person.find(1)       # returns the object for ID = 1
@@ -414 +419 @@
-      #   Person.find(:all, :conditions => [ "category IN (?)", categories], :limit => 50)
-      #   Person.find(:all, :offset => 10, :limit => 10)
-      #   Person.find(:all, :include => [ :account, :friends ])
+      #   Person.find(:all, :include => :account, :lazy_associations => true, :conditions => ['accounts.last_accessed_time < ?', 1.year.ago])
-      #   Person.find(:all, :group => "category")
+      #   
+      # Example for find_all: with :lazy_associations => true
-      #
+      #   Person.find(:all, :include => :account, :lazy_associations => true, :conditions => ['accounts.last_accessed_time < ?', 1.year.ago]) 
+      #
-      # Example for find with a lock. Imagine two concurrent transactions:
-      # each will read person.visits == 2, add 1 to it, and save, resulting
-      # in two saves of person.visits = 3.  By locking the row, the second
@@ -1658 +1668 @@
-          end
-        end
-
-
+lazy_associations, :
-                               :order, :select, :readonly, :group, :from, :lock ]
-
-        def validate_find_options(options) #:nodoc: