From: zby <zby@bd8105ee-0ff8-0310-8827-fb3f25b6796d>
Date: Thu, 7 May 2009 19:15:44 +0000 (+0000)
Subject: Related rows by id
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=4bb09f7fc7ffdb7adf715d4c42b9be6624809f7d;p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate

Related rows by id
---

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 8992718..0997ff3 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -30,6 +30,7 @@ sub recursive_update {
     if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
         return $updates;
     }
+    # warn Dumper( $updates ); use Data::Dumper;
     # direct column accessors
     my %columns;
 
@@ -42,7 +43,6 @@ sub recursive_update {
     my %post_updates;
     my %other_methods;
     my %columns_by_accessor = _get_columns_by_accessor( $self );
-
     for my $name ( keys %$updates ) {
         my $source = $self->result_source;
         if ( $columns_by_accessor{$name}
@@ -52,10 +52,10 @@ sub recursive_update {
             $columns{$name} = $updates->{$name};
             next;
         }
-        if( !( $source->has_relationship($name) && ref( $updates->{$name} ) ) ){
+        if( !( $source->has_relationship($name) ) ){
             $other_methods{$name} = $updates->{$name};
+            next;
         }
-        next if !$source->has_relationship($name);
         my $info = $source->relationship_info($name);
         if (
             _master_relation_cond(
@@ -69,7 +69,7 @@ sub recursive_update {
             $post_updates{$name} = $updates->{$name};
         }
     }
-    # warn 'columns: ' . Dumper( \%columns ); use Data::Dumper;
+    # warn 'other: ' . Dumper( \%other_methods ); use Data::Dumper;
 
     my @missing =
       grep { !exists $columns{$_} && !exists $fixed_fields{$_} } $self->result_source->primary_columns;
@@ -154,19 +154,25 @@ sub _update_relation {
     }
     else {
         my $sub_updates = $updates->{$name};
-        $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH';
         my $sub_object;
-        if( $info->{attrs}{accessor} eq 'single' && defined $object->$name ){
-            $sub_object = recursive_update( 
-                resultset => $related_result, 
-                updates => $sub_updates, 
-                object =>  $object->$name 
-            );
+        if( ref $sub_updates ){
+            $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH';
+            # for might_have relationship
+            if( $info->{attrs}{accessor} eq 'single' && defined $object->$name ){
+                $sub_object = recursive_update( 
+                    resultset => $related_result, 
+                    updates => $sub_updates, 
+                    object =>  $object->$name 
+                );
+            }
+            else{ 
+                $sub_object =
+                recursive_update( resultset => $related_result, updates => $sub_updates );
+            }
+        }
+        elsif( ! ref $sub_updates ){
+            $sub_object = $related_result->find( $sub_updates );
         }
-        else{ 
-           $sub_object =
-             recursive_update( resultset => $related_result, updates => $sub_updates );
-         }
         $object->set_from_related( $name, $sub_object );
     }
 }
diff --git a/t/var/dvdzbr.db b/t/var/dvdzbr.db
index 7eb36bb..c31073d 100644
Binary files a/t/var/dvdzbr.db and b/t/var/dvdzbr.db differ