X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate;a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSet%2FRecursiveUpdate.pm;h=95725d0a5b9764ab58ebc5642092ccfe6d94c009;hp=a152dc02c21530f4d7d9fc306341ea6e4eb85bbf;hb=ecf081dd43f887e5a7458601f636ae9e5e8c5832;hpb=264a28fa4c2fdab1244cdba5c9e606ce8c411c0a

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index a152dc0..95725d0 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -30,39 +30,35 @@ sub recursive_update {
     }
     $object ||= $self->new( {} );
 
+    # first update columns and other accessors - so that later related records can be found
     for my $name ( keys %$updates ){ 
-        if($object->can($name)){
-            my $value = $updates->{$name};
+        if( $self->is_for_column( $object, $name, $updates->{$name} ) ) {
+            $object->$name( $updates->{$name} );
+        }
+    }
+    for my $name ( keys %$updates ){ 
+        if($object->can($name) && !$self->is_for_column( $object, $name, $updates->{$name} ) ){
 
             # updating relations that that should be done before the row is inserted into the database
             # like belongs_to
-            if( $object->result_source->has_relationship($name) 
-                    and 
-                ref $value
-            ){
                 my $info = $object->result_source->relationship_info( $name );
                 if( $info and not $info->{attrs}{accessor} eq 'multi'
                         and 
                     _master_relation_cond( $object, $info->{cond}, $self->_get_pk_for_related( $name ) )
                 ){
                     my $related_result = $object->related_resultset( $name );
-                    my $sub_object = $related_result->recursive_update( $value );
+                    my $resolved =  $self->result_source->resolve_condition(
+                        $info->{cond}, $name, $object
+                    );
+#                    warn 'resolved: ' . Dumper( $resolved ); use Data::Dumper;
+                    my $sub_object = $related_result->recursive_update( $updates->{$name} );
                     $object->set_from_related( $name, $sub_object );
                 }
-            }
-            # columns and other accessors
-            elsif( $object->result_source->has_column($name) 
-                    or 
-                !$object->can( 'set_' . $name ) 
-            ) {
-                $object->$name($value);
-            }
         }
-        #warn Dumper($object->{_column_data}); use Data::Dumper;
     }
     $self->_delete_empty_auto_increment($object);
     # don't allow insert to recurse to related objects - we do the recursion ourselves
-    $object->{_rel_in_storage} = 1;
+#    $object->{_rel_in_storage} = 1;
 #    warn Dumper( $object->{_column_data} );
     $object->update_or_insert;
 
@@ -104,6 +100,20 @@ sub recursive_update {
     return $object;
 }
 
+sub is_for_column { 
+    my( $self, $object, $name, $value ) = @_;
+    return 
+    $object->can($name)
+    && !( 
+        $object->result_source->has_relationship($name)
+        && ref( $value )
+    )
+    && ( 
+        $object->result_source->has_column($name)
+        || !$object->can( 'set_' . $name )
+    )
+}
+
 sub is_m2m {
     my( $self, $relation ) = @_;
     my $rclass = $self->result_class;