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=78a4bb261f40175cec39ac910f65961795134afa;hp=95813ca963c45e0f9add39dea9bdc18bcb3bc8eb;hb=8f5e0a3a71ba1dc147c876d94004cda0d07ec200;hpb=46f6b2c250e4899d6a7b21d7bb254fc43167911f

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 95813ca..78a4bb2 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -113,8 +113,7 @@ sub recursive_update {
         $object->$name( $updates->{$name} ) if $object->can($name);
     }
     for my $name ( keys %pre_updates ) {
-        my $info = $object->result_source->relationship_info($name);
-        _update_relation( $self, $name, $updates->{$name}, $object, $info,
+        _update_relation( $self, $name, $updates->{$name}, $object,
             $if_not_submitted );
     }
 
@@ -161,8 +160,7 @@ sub recursive_update {
         }
     }
     for my $name ( keys %post_updates ) {
-        my $info = $object->result_source->relationship_info($name);
-        _update_relation( $self, $name, $updates->{$name}, $object, $info,
+        _update_relation( $self, $name, $updates->{$name}, $object,
             $if_not_submitted );
     }
     return $object;
@@ -181,11 +179,14 @@ sub _get_columns_by_accessor {
     return %columns;
 }
 
-# Arguments: $name, $updates, $object, $info, $if_not_submitted
+# Arguments: $name, $updates, $object, $if_not_submitted
 
 sub _update_relation {
-    my ( $self, $name, $updates, $object, $info, $if_not_submitted ) = @_;
-    my $related_result =
+    my ( $self, $name, $updates, $object, $if_not_submitted ) = @_;
+    my $info = $object->result_source->relationship_info($name);
+
+    # get a related resultset without a condition
+    my $related_resultset =
         $self->related_resultset($name)->result_source->resultset;
     my $resolved;
     if ( $self->result_source->can('_resolve_condition') ) {
@@ -193,11 +194,6 @@ sub _update_relation {
             $self->result_source->_resolve_condition( $info->{cond}, $name,
             $object );
     }
-    else {
-        $resolved =
-            $self->result_source->resolve_condition( $info->{cond}, $name,
-            $object );
-    }
 
     # warn "$name resolved: " . Dumper( $resolved ); use Data::Dumper;
     $resolved = {}
@@ -208,15 +204,15 @@ sub _update_relation {
     # an arrayref is only valid for has_many rels
     if ( ref $updates eq 'ARRAY' ) {
         my @updated_ids;
-        for my $sub_updates ( @{ $updates } ) {
+        for my $sub_updates ( @{$updates} ) {
             my $sub_object = recursive_update(
-                resultset => $related_result,
+                resultset => $related_resultset,
                 updates   => $sub_updates,
                 resolved  => $resolved
             );
             push @updated_ids, $sub_object->id;
         }
-        my @related_pks = $related_result->result_source->primary_columns;
+        my @related_pks = $related_resultset->result_source->primary_columns;
         if ( defined $if_not_submitted && $if_not_submitted eq 'delete' ) {
 
             # only handles related result classes with single primary keys
@@ -248,21 +244,21 @@ sub _update_relation {
                 && defined $object->$name )
             {
                 $sub_object = recursive_update(
-                    resultset => $related_result,
+                    resultset => $related_resultset,
                     updates   => $updates,
                     object    => $object->$name
                 );
             }
             else {
                 $sub_object = recursive_update(
-                    resultset => $related_result,
+                    resultset => $related_resultset,
                     updates   => $updates,
                     resolved  => $resolved
                 );
             }
         }
         elsif ( !ref $updates ) {
-            $sub_object = $related_result->find($updates)
+            $sub_object = $related_resultset->find($updates)
                 unless (
                 !$updates
                 && ( exists $info->{attrs}{join_type}