fixed bug where an object that has already been found by its pk is overwritten by...

[chaz/p5-DBIx-Class-ResultSet-RecursiveUpdate] / lib / DBIx / Class / ResultSet / RecursiveUpdate.pm

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index c42f1b7cc6321aa195764c75bdc50da608dba68b..67a7ffd602bf7605eaa33d06b045a14343e68916 100644 (file)
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -56,8 +56,11 @@ sub recursive_update {
     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
@@ -78,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