X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSet%2FRecursiveUpdate.pm;h=1d6168132f00ea8cc4c3d3604640121a97ef32f7;hb=e370544994a3bd3de867b19215096c45118a00f5;hp=89fb5697e0b2c60a4466950d8a36a4b76adb434b;hpb=c12e861ee8475cd55948a909374fd3c3377e9efa;p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 89fb569..1d61681 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 = @_;
@@ -59,10 +60,15 @@ sub recursive_update {
     croak 'fixed fields needs to be an arrayref'
         if defined $fixed_fields && ref $fixed_fields ne 'ARRAY';
 
+    # always warn about additional parameters if storage debugging is enabled
+    $unknown_params_ok = 0
+        if $source->storage->debug;
+
     if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
         return $updates;
     }
-    if ( exists $updates->{id} ) {
+
+    if ( !defined $object && exists $updates->{id} ) {
 
         # warn "finding object by id " . $updates->{id} . "\n";
         $object = $self->find( $updates->{id}, { key => 'primary' } );
@@ -73,20 +79,31 @@ 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;
-    if ( !$object && !scalar @missing ) {
+
+    # warn "MISSING: " . join(', ', @missing) . "\n";
+    if ( !defined $object && scalar @missing == 0 ) {
 
         # 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;
-    if ( !$object && !scalar @missing ) {
 
-        # warn 'finding by +resolved: ' . Dumper( $updates ); use Data::Dumper;
+    # 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;
         $object = $self->find( $updates, { key => 'primary' } );
     }
 
@@ -206,7 +223,7 @@ sub recursive_update {
         #warn "update m2m $name\n";
         # TODO: only first pk col is used
         my ($pk) = _get_pk_for_related( $self, $name );
-        my @rows = ();
+        my @rows;
         my $result_source = $object->$name->result_source;
         my @updates;
         if ( defined $value && ref $value eq 'ARRAY' ) {
@@ -215,8 +232,9 @@ sub recursive_update {
         elsif ( defined $value && !ref $value ) {
             @updates = ($value);
         }
-        else {
-            carp "value of many-to-many rel '$name' must be an arrayref or scalar";
+        elsif ( defined $value ) {
+            carp
+                "value of many-to-many rel '$name' must be an arrayref or scalar: $value";
         }
         for my $elem (@updates) {
             if ( blessed($elem) && $elem->isa('DBIx::Class::Row') ) {
@@ -292,6 +310,8 @@ sub _update_relation {
             && $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION
             == $resolved;
 
+    #warn "RESOLVED: " . Dumper($resolved); use Data::Dumper;
+
     my @rel_cols = keys %{ $info->{cond} };
     map {s/^foreign\.//} @rel_cols;