<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>tests/integration/associations/many_to_one_test.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -121,5 +121,8 @@ module Clipper
     class NoKeyError &lt; StandardError
     end
 
+    class DuplicateAssociationError &lt; StandardError
+    end
+
   end
 end
\ No newline at end of file</diff>
      <filename>lib/clipper/mapping.rb</filename>
    </modified>
    <modified>
      <diff>@@ -22,13 +22,13 @@ module Clipper
         return
       end
 
-#      @session.mappings[object.class].associations.each do |association|
-#        if association.is_a?(Clipper::Mappings::ManyToOne)
-#          if (associated_object = association.get(object))
-#            @session.enlist(associated_object)
-#          end
-#        end
-#      end
+      @session.mappings[object.class].associations.each do |association|
+        if association.is_a?(Clipper::Mapping::ManyToOne)
+          if (associated_object = association.get(object))
+            @session.enlist(associated_object)
+          end
+        end
+      end
 
       # Add CREATE ZooKeeper
       @work_orders &lt;&lt; new_work_order
@@ -89,15 +89,15 @@ module Clipper
         when :create, :update then
           collection = work_order[1].is_a?(Collection) ? work_order[1] : Collection.new(@session.mappings[work_order[1].class], [work_order[1]].flatten)
 
-#          @session.mappings[work_order[1].class].associations.each do |association|
-#            next unless association.is_a?(Clipper::Mappings::ManyToOne)
-#
-#            collection.each do |instance|
-#              if (associated_object = association.get(instance))
-#                association.set_key(instance, associated_object)
-#              end
-#            end
-#          end
+          @session.mappings[work_order[1].class].associations.each do |association|
+            next unless association.is_a?(Clipper::Mapping::ManyToOne)
+
+            collection.each do |instance|
+              if (associated_object = association.get(instance))
+                association.set_key(instance, associated_object)
+              end
+            end
+          end
 
           @session.repository.send(work_order[0], collection, @session)
 </diff>
      <filename>lib/clipper/unit_of_work.rb</filename>
    </modified>
    <modified>
      <diff>@@ -44,7 +44,7 @@ orm.map(Integration::SampleModels::Exhibit, &quot;exhibits&quot;) do |exhibits, type|
 
   exhibits.key :id
 
-#  exhibits.many_to_one(:zoo, Integration::SampleModels::Zoo) do |exhibit, zoo|
-#    zoo.id.eq(exhibit.zoo_id)
-#  end
+  exhibits.many_to_one(:zoo, Integration::SampleModels::Zoo) do |exhibit, zoo|
+    zoo.id.eq(exhibit.zoo_id)
+  end
 end
\ No newline at end of file</diff>
      <filename>tests/integration/sample_models_mapping.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>burn/tests/integration/associations/many_to_one_test.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>74d41fcbdd59014d1acd8147581a209d6ea03f85</id>
    </parent>
  </parents>
  <author>
    <name>Fabio Rehm</name>
    <email>fgrehm@gmail.com</email>
  </author>
  <url>http://github.com/wiecklabs/clipper/commit/5c1347c18c693d87ec622ea25a75ba56d93d99ae</url>
  <id>5c1347c18c693d87ec622ea25a75ba56d93d99ae</id>
  <committed-date>2009-09-22T23:50:12-07:00</committed-date>
  <authored-date>2009-09-22T23:50:12-07:00</authored-date>
  <message>Handling many-to-one associations</message>
  <tree>f772044a5f144102a69ca0e5c02d006dbf1858f8</tree>
  <committer>
    <name>Fabio Rehm</name>
    <email>fgrehm@gmail.com</email>
  </committer>
</commit>
