From: Zbigniew Lukasiak <zby@zby.aster.net.pl>
Date: Tue, 6 Apr 2010 08:37:19 +0000 (+0200)
Subject: merge conflict resolved
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate;a=commitdiff_plain;h=db9660bec391cd788bf6b1bbee3ff4333c99633b;hp=-c

merge conflict resolved
---

db9660bec391cd788bf6b1bbee3ff4333c99633b
diff --combined lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index ce89f38,eeec84c..0414232
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@@ -107,7 -107,8 +107,7 @@@ sub recursive_update 
  # don't allow insert to recurse to related objects - we do the recursion ourselves
  #    $object->{_rel_in_storage} = 1;
  
 -    $object->update_or_insert;
 -
 +    $object->update_or_insert if $object->is_changed;
  
      # updating many_to_many
      for my $name ( keys %$updates ) {
@@@ -213,8 -214,8 +213,8 @@@ sub _update_relation 
              }
          }
          elsif( ! ref $sub_updates ){
-             $sub_object = $related_result->find( $sub_updates )
-              unless (!$sub_updates && ($info->{attrs}{join_type} eq 'LEFT'));
+             $sub_object = $related_result->find( $sub_updates ) 
 -             unless (!$sub_updates && ($info->{attrs}{join_type} eq 'LEFT'));
++                unless (!$sub_updates && ($info->{attrs}{join_type} eq 'LEFT'));
          }
          $object->set_from_related( $name, $sub_object )
            unless (!$sub_object && !$sub_updates && ($info->{attrs}{join_type} eq 'LEFT'));