only limit resultset if there are related rows left

[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 27395cccdc03b0b32d3fd84214efce570907a9ed..c0be5cdd27a82ec2e0eeb8d7be061a547a1cb67f 100644 (file)
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -267,21 +267,19 @@ sub _update_relation {
                 ->{is_nullable};
     }
 
-    #warn "\tNULLABLE: $all_fks_nullable\n";
     $if_not_submitted = $all_fks_nullable ? 'nullify' : 'delete'
         unless defined $if_not_submitted;
 
-    # handle undef
-    #if (not defined $updates && $if_not_submitted eq 'delete') {
-    #    warn "$name " . ref $object;
-    #    $object->related_resultset($name)->delete;
-    #    return;
-    #}
+    #warn "\tNULLABLE: $all_fks_nullable ACTION: $if_not_submitted\n";
 
     #warn "RELINFO for $name: " . Dumper($info); use Data::Dumper;
 
     # the only valid datatype for a has_many rels is an arrayref
     if ( $info->{attrs}{accessor} eq 'multi' ) {
+
+        # handle undef like empty arrayref
+        $updates = []
+            unless defined $updates;
         $self->throw_exception(
             "data for has_many relationship '$name' must be an arrayref")
             unless ref $updates eq 'ARRAY';
@@ -301,56 +299,47 @@ sub _update_relation {
 
         #warn "\tcreated and updated related rows\n";
 
-        my @cond;
         my @related_pks = $related_resultset->result_source->primary_columns;
-        for my $obj (@updated_objs) {
-            my %cond_for_obj;
-            for my $col (@related_pks) {
-                $cond_for_obj{$col} = $obj->get_column($col);
+
+        my $rs_rel_delist = $object->$name;
+
+        # foreign table has a single pk column
+        if ( scalar @related_pks == 1 ) {
+            $rs_rel_delist = $rs_rel_delist->search_rs(
+                {   $related_pks[0] =>
+                        { -not_in => [ map ( $_->id, @updated_objs ) ] }
+                }
+            );
+        }
+
+        # foreign table has multiple pk columns
+        else {
+            my @cond;
+            for my $obj (@updated_objs) {
+                my %cond_for_obj;
+                for my $col (@related_pks) {
+                    $cond_for_obj{$col} = $obj->get_column($col);
+                }
+                push @cond, \%cond_for_obj;
+            }
+            # only limit resultset if there are related rows left
+            if (scalar @cond) {
+                $rs_rel_delist = $rs_rel_delist->search_rs( { -not => [@cond] } );
             }
-            push @cond, \%cond_for_obj;
         }
-        my %cond = ( -not => [@cond] );
 
         #warn "\tCOND: " . Dumper(\%cond);
-        my $rs_rel_delist = $object->$name->search_rs( \%cond );
-
         #my $rel_delist_cnt = $rs_rel_delist->count;
-        my @foo = $rs_rel_delist->all;
         if ( $if_not_submitted eq 'delete' ) {
 
             #warn "\tdeleting related rows: $rel_delist_cnt\n";
             $rs_rel_delist->delete;
-
-            # # only handles related result classes with single primary keys
-            # if ( 1 == $rel_col_cnt ) {
-            # $object->$name->search(
-            # {   $rel_cols[0] =>
-            # { -not_in => [ map ( $_->id, @updated_objs ) ] }
-            # }
-            # )->delete;
-            # }
-            # else {
-            # warn "multi-column relationships aren't supported\n";
-            # }
         }
         elsif ( $if_not_submitted eq 'set_to_null' ) {
 
             #warn "\tnullifying related rows: $rel_delist_cnt\n";
             my %update = map { $_ => undef } @rel_cols;
             $rs_rel_delist->update( \%update );
-
-            # # only handles related result classes with single primary keys
-            # if ( 1 == $rel_col_cnt ) {
-            # $object->$name->search(
-            # {   $rel_cols[0] =>
-            # { -not_in => [ map ( $_->id, @updated_objs ) ] }
-            # }
-            # )->update( { $rel_cols[0] => undef } );
-            # }
-            # else {
-            # warn "multi-column relationships aren't supported\n";
-            # }
         }
     }
     elsif ($info->{attrs}{accessor} eq 'single'