refetch if not all attributes filled

funny-falcon · Sep 20, 2010 · f984d25 · f984d25
1 parent 6e3ce5b
commit f984d25
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/identity_map/active_record/base.rb b/lib/identity_map/active_record/base.rb
@@ -29,10 +29,17 @@ def if_id_map
         end
 
         private
+
+          def fetch_single(map, id)
+            if (obj = map[id]) && obj.attribute_names == column_names
+              obj
+            end
+          end
+
           def fetch_from_map(map, ids)
             result, not_cached = [], []
             ids.each do |id|
-              if ( obj = map[id] )
+              if ( obj = fetch_single(map, id) )
                 result << obj
               else
                 not_cached << id
@@ -74,7 +81,7 @@ def find_with_identity_map( *args )
                     end
                   end
                 else
-                  map[ids]
+                  fetch_single(map, ids)
                 end
               end
             end || find_without_identity_map(*args)

diff --git a/spec/identity_map_spec.rb b/spec/identity_map_spec.rb
@@ -38,6 +38,14 @@
     d2 = Customer.find(:first, :conditions=>["id = ?", d1.id])
     d1.__id__.should == d2.__id__
   end
+
+  it "should refetch to fill missed attributes" do
+    d1 = Customer.find(:first, :select => 'id, name')
+    d1.read_attribute(:value).should be_nil
+    d2 = Customer.find(d1.id)
+    d2.__id__.should == d1.__id__
+    d1.value.should_not be_nil
+  end
 
   context "creation and deletion:" do
     before(:each) do