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=c0db8b415ebac682e0a1bad8fe19b18722fb0604;hp=20158603eb191e82e672e138c2e2c20bd0aec591;hb=986ee14c997fe16c849e26580c772db0f407875d;hpb=836cf9832dc52973f698b000d7df8604c0b0d342

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 2015860..c0db8b4 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -37,6 +37,7 @@ package DBIx::Class::ResultSet::RecursiveUpdate::Functions;
 use Carp::Clan qw/^DBIx::Class|^HTML::FormHandler|^Try::Tiny/;
 use Scalar::Util qw( blessed );
 use List::MoreUtils qw/ any /;
+use Try::Tiny;
 
 sub recursive_update {
     my %params = @_;
@@ -78,8 +79,11 @@ sub recursive_update {
 
     my %fixed_fields = map { $_ => 1 } @$fixed_fields
         if $fixed_fields;
+
+    # the updates hashref might contain the pk columns
+    # but with an undefined value
     my @missing =
-        grep { !exists $updates->{$_} && !exists $fixed_fields{$_} }
+        grep { !defined $updates->{$_} && !exists $fixed_fields{$_} }
         $source->primary_columns;
 
     # warn "MISSING: " . join(', ', @missing) . "\n";
@@ -88,11 +92,18 @@ sub recursive_update {
         # warn 'finding by: ' . Dumper( $updates ); use Data::Dumper;
         $object = $self->find( $updates, { key => 'primary' } );
     }
+
+    # add the resolved columns to the updates hashref
     $updates = { %$updates, %$resolved };
-    @missing = grep { !exists $resolved->{$_} } @missing;
+
+    # the resolved hashref might contain the pk columns
+    # but with an undefined value
+    @missing = grep { !defined $resolved->{$_} } @missing;
+
+    #warn "MISSING2: " . join( ', ', @missing ) . "\n";
     if ( !defined $object && scalar @missing == 0 ) {
 
-        # warn 'finding by +resolved: ' . Dumper( $updates ); use Data::Dumper;
+       # warn 'finding by +resolved: ' . Dumper( $updates ); use Data::Dumper;
         $object = $self->find( $updates, { key => 'primary' } );
     }
 
@@ -315,7 +326,7 @@ sub _update_relation {
                 ->{is_nullable};
     }
 
-    $if_not_submitted = $all_fks_nullable ? 'nullify' : 'delete'
+    $if_not_submitted = $all_fks_nullable ? 'set_to_null' : 'delete'
         unless defined $if_not_submitted;
 
     #warn "\tNULLABLE: $all_fks_nullable ACTION: $if_not_submitted\n";
@@ -376,9 +387,9 @@ sub _update_relation {
                 $rs_rel_delist =
                     $rs_rel_delist->search_rs( { -not => [@cond] } );
             }
+            #warn "\tCOND: " . Dumper(\@cond);
         }
 
-        #warn "\tCOND: " . Dumper(\%cond);
         #my $rel_delist_cnt = $rs_rel_delist->count;
         if ( $if_not_submitted eq 'delete' ) {