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

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index a152dc0..3929e49 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -14,6 +14,12 @@ sub recursive_update {
     if( blessed( $updates ) && $updates->isa( 'DBIx::Class::Row' ) ){
         return $updates;
     }
+    my %columns;
+    for my $name ( keys %$updates ){ 
+        if( $self->is_for_column( $name, $updates->{$name} ) ){
+            $columns{$name} = $updates->{$name};
+        }
+    }
     my $object;
 #    warn 'cond: ' . Dumper( $self->{cond} ); use Data::Dumper;
 #    warn 'where: ' . Dumper( $self->{attrs}{where} ); use Data::Dumper;
@@ -22,47 +28,41 @@ sub recursive_update {
         $self->{cond} = undef;
         $self->{attrs}{where} = undef;
         if( ! scalar @missing ){
-            $object = $self->find( $updates, { key => 'primary' } );
+            $object = $self->find( \%columns, { key => 'primary' } );
         }
     }
     else{
-        $object = $self->find( $updates, { key => 'primary' } );
+        $object = $self->find( \%columns, { key => 'primary' } );
     }
     $object ||= $self->new( {} );
 
+    # first update columns and other accessors - so that later related records can be found
+    for my $name ( keys %columns ){ 
+            $object->$name( $updates->{$name} );
+    }
     for my $name ( keys %$updates ){ 
-        if($object->can($name)){
-            my $value = $updates->{$name};
+        if($object->can($name) && !$self->is_for_column( $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 ) )
+                    _master_relation_cond( $object->result_source, $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;
 
@@ -95,7 +95,7 @@ sub recursive_update {
                 }
             }
             # might_have and has_one case
-            elsif ( ! _master_relation_cond( $object, $info->{cond}, $self->_get_pk_for_related( $name ) ) ){
+            elsif ( ! _master_relation_cond( $object->result_source, $info->{cond}, $self->_get_pk_for_related( $name ) ) ){
                 my $sub_object = $object->search_related( $name )->recursive_update( $value );
                 #$object->set_from_related( $name, $sub_object );
             }
@@ -104,6 +104,18 @@ sub recursive_update {
     return $object;
 }
 
+sub is_for_column {
+    my( $self, $name, $value ) = @_;
+    my $source = $self->result_source;
+    return
+    $source->has_column($name)
+    && !(
+        $source->has_relationship($name)
+        && ref( $value )
+    )
+}
+
+
 sub is_m2m {
     my( $self, $relation ) = @_;
     my $rclass = $self->result_class;
@@ -167,14 +179,14 @@ sub _get_pk_for_related {
 }
 
 sub _master_relation_cond {
-    my ( $object, $cond, @foreign_ids ) = @_;
+    my ( $source, $cond, @foreign_ids ) = @_;
     my $foreign_ids_re = join '|', @foreign_ids;
     if ( ref $cond eq 'HASH' ){
         for my $f_key ( keys %{$cond} ) {
             # might_have is not master
             my $col = $cond->{$f_key};
             $col =~ s/self\.//;
-            if( $object->column_info( $col )->{is_auto_increment} ){
+            if( $source->column_info( $col )->{is_auto_increment} ){
                 return 0;
             }
             if( $f_key =~ /^foreign\.$foreign_ids_re/ ){
@@ -183,7 +195,7 @@ sub _master_relation_cond {
         }
     }elsif ( ref $cond eq 'ARRAY' ){
         for my $new_cond ( @$cond ) {
-            return 1 if _master_relation_cond( $object, $new_cond, @foreign_ids );
+            return 1 if _master_relation_cond( $source, $new_cond, @foreign_ids );
         }
     }
     return;