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=f70e4fbc63ef126a52a91b1457ce5c27a9f4f2cf;hp=59dbc47311d5368778107044ec6eddd81e3a1250;hb=aba481dc507497b0c4629d8f43adc70284ac1d24;hpb=796be7d1efe8f69366f756021d86a427c222a5c3

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 59dbc47..f70e4fb 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 = @_;
@@ -49,36 +50,64 @@ sub recursive_update {
 
     my $source = $self->result_source;
 
+    croak "first parameter needs to be defined"
+        unless defined $updates;
+
+    croak "first parameter needs to be a hashref"
+        unless ref($updates) eq 'HASH';
+
     # warn 'entering: ' . $source->from();
-    carp 'fixed fields needs to be an array ref'
+    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' } );
+
         # warn "object not found by id\n"
         #     unless defined $object;
     }
 
     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{$_} }
-        $source->primary_columns;
-    if ( !$object && !scalar @missing ) {
+        grep {
+        ( !exists $updates->{$_}
+                || ( exists $updates->{$_} && !defined $updates->{$_} ) )
+            && !exists $fixed_fields{$_}
+        } $source->primary_columns;
+
+    # 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 ) {
+    # the resolved hashref might contain the pk columns
+    # but with an undefined value
+    @missing = grep {
+        !exists $resolved->{$_}
+            || ( exists $resolved->{$_} && !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' } );
     }
 
@@ -104,6 +133,7 @@ sub recursive_update {
     #    warn 'updates: ' . Dumper( $updates ); use Data::Dumper;
     #    warn 'columns: ' . Dumper( \%columns_by_accessor );
     for my $name ( keys %$updates ) {
+
         # columns
         if ( exists $columns_by_accessor{$name}
             && !( $source->has_relationship($name)
@@ -200,23 +230,26 @@ sub recursive_update {
         my @rows;
         my $result_source = $object->$name->result_source;
         my @updates;
-        if ( !defined $value ) {
-            #next;
-            @updates = ();
-        }
-        elsif ( ref $value ) {
+        if ( defined $value && ref $value eq 'ARRAY' ) {
             @updates = @{$value};
         }
-        else {
+        elsif ( defined $value && !ref $value ) {
             @updates = ($value);
         }
+        elsif ( defined $value ) {
+            carp
+                "value of many-to-many rel '$name' must be an arrayref or scalar: $value";
+        }
         for my $elem (@updates) {
-            if ( ref $elem ) {
+            if ( blessed($elem) && $elem->isa('DBIx::Class::Row') ) {
                 push @rows, $elem;
-                    # recursive_update(
-                    # resultset => $result_source->resultset,
-                    # updates   => $elem
-                    # );
+            }
+            elsif ( ref $elem eq 'HASH' ) {
+                push @rows,
+                    recursive_update(
+                    resultset => $result_source->resultset,
+                    updates   => $elem
+                    );
             }
             else {
                 push @rows,
@@ -281,6 +314,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;
 
@@ -379,9 +414,12 @@ sub _update_relation {
         #warn "\tupdating rel '$name': $if_not_submitted\n";
         my $sub_object;
         if ( ref $updates ) {
+            if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
+                $sub_object = $updates;
+            }
 
             # for might_have relationship
-            if ( $info->{attrs}{accessor} eq 'single'
+            elsif ( $info->{attrs}{accessor} eq 'single'
                 && defined $object->$name )
             {
                 $sub_object = recursive_update(