X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FCascadeActions.pm;h=3d5da76390ae59cba06a988b4a5c42bae5c6216a;hb=e60dc79fcd4d6318e83584b826526e65048b86a9;hp=e1d1341177858283460f0a52ef4d9a54b5c5629b;hpb=4685e00665ca987cd3acae87bc1d988f8ab56b31;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Relationship/CascadeActions.pm b/lib/DBIx/Class/Relationship/CascadeActions.pm
index e1d1341..3d5da76 100644
--- a/lib/DBIx/Class/Relationship/CascadeActions.pm
+++ b/lib/DBIx/Class/Relationship/CascadeActions.pm
@@ -1,4 +1,8 @@
-package DBIx::Class::Relationship::CascadeActions;
+package # hide from PAUSE
+    DBIx::Class::Relationship::CascadeActions;
+
+use strict;
+use warnings;
 
 sub delete {
   my ($self, @rest) = @_;
@@ -9,10 +13,11 @@ sub delete {
 
   my $ret = $self->next::method(@rest);
 
-  my %rels = map { $_ => $self->relationship_info($_) } $self->relationships;
+  my $source = $self->result_source;
+  my %rels = map { $_ => $source->relationship_info($_) } $source->relationships;
   my @cascade = grep { $rels{$_}{attrs}{cascade_delete} } keys %rels;
   foreach my $rel (@cascade) {
-    $self->search_related($rel)->delete;
+    $self->search_related($rel)->delete_all;
   }
   return $ret;
 }
@@ -24,10 +29,15 @@ sub update {
 
   my $ret = $self->next::method(@rest);
 
-  my %rels = map { $_ => $self->relationship_info($_) } $self->relationships;
+  my $source = $self->result_source;
+  my %rels = map { $_ => $source->relationship_info($_) } $source->relationships;
   my @cascade = grep { $rels{$_}{attrs}{cascade_update} } keys %rels;
   foreach my $rel (@cascade) {
-    $_->update for $self->$rel;
+    next if (
+      $rels{$rel}{attrs}{accessor} eq 'single'
+      && !exists($self->{_relationship_data}{$rel})
+    );
+    $_->update for grep defined, $self->$rel;
   }
   return $ret;
 }