small fixes

[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..965fa1c385a5a0c2aa90888799dc3c936ff86eb3 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
@@ -75,10 +78,12 @@ sub recursive_update {
         grep { !exists $resolved->{$_} } @missing;
     if ( !$object && !scalar @missing ) {
 
-       # warn 'finding by +resolved: ' . Dumper( $updates ); use Data::Dumper;
+        # 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
@@ -166,7 +171,7 @@ sub recursive_update {
     for my $name ( keys %other_methods ) {
 
         #warn "update other $name\n";
-        $object->$name( $updates->{$name} );
+        $object->$name( $other_methods{$name} );
     }
     for my $name ( keys %pre_updates ) {
 
@@ -179,7 +184,7 @@ sub recursive_update {
     # don't allow insert to recurse to related objects
     # do the recursion ourselves
     # $object->{_rel_in_storage} = 1;
-    #warn "CHANGED: " . $object->is_changed . "\n":
+    #warn "CHANGED: " . $object->is_changed . "\n";
     #warn "IN STOR: " .  $object->in_storage . "\n";
     $object->update_or_insert if $object->is_changed;
     $object->discard_changes;