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=67a7ffd602bf7605eaa33d06b045a14343e68916;hp=2d0c235ae5370a532b3add0ce8401ac6c0f70b39;hb=6a543315be718c91b051b5a0fbd4100892dda59f;hpb=d94f7e813dcc0fa5de6d46a0c9739fdba22b44cf

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 2d0c235..67a7ffd 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -47,22 +47,27 @@ sub recursive_update {
         };
     $resolved ||= {};
 
-    # warn 'entering: ' . $self->result_source->from();
+    my $source = $self->result_source;
+
+    # warn 'entering: ' . $source->from();
     carp 'fixed fields needs to be an array ref'
         if defined $fixed_fields && ref $fixed_fields ne 'ARRAY';
 
     if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
         return $updates;
     }
-    if ( $updates->{id} ) {
+    if ( exists $updates->{id} ) {
+        # warn "finding object by id " . $updates->{id} . "\n";
         $object = $self->find( $updates->{id}, { key => 'primary' } );
+        # warn "object not found by id\n"
+        #     unless defined $object;
     }
 
     my %fixed_fields = map { $_ => 1 } @$fixed_fields
         if $fixed_fields;
     my @missing =
         grep { !exists $updates->{$_} && !exists $fixed_fields{$_} }
-        $self->result_source->primary_columns;
+        $source->primary_columns;
     if ( !$object && !scalar @missing ) {
 
         # warn 'finding by: ' . Dumper( $updates ); use Data::Dumper;
@@ -76,7 +81,9 @@ sub recursive_update {
        # warn 'finding by +resolved: ' . Dumper( $updates ); use Data::Dumper;
         $object = $self->find( $updates, { key => 'primary' } );
     }
-    $object ||= $self->new( {} );
+
+    $object = $self->new( {} )
+        unless defined $object;
 
     # warn Dumper( $updates ); use Data::Dumper;
     # direct column accessors
@@ -96,8 +103,6 @@ sub recursive_update {
     #    warn 'updates: ' . Dumper( $updates ); use Data::Dumper;
     #    warn 'columns: ' . Dumper( \%columns_by_accessor );
     for my $name ( keys %$updates ) {
-        my $source = $self->result_source;
-
         # columns
         if ( exists $columns_by_accessor{$name}
             && !( $source->has_relationship($name)