I hate you all.

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Relationship / CascadeActions.pm

diff --git a/lib/DBIx/Class/Relationship/CascadeActions.pm b/lib/DBIx/Class/Relationship/CascadeActions.pm
index 71a28c0..3d5da76 100644 (file)
--- 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) = @_;
@@ -13,7 +17,7 @@ sub delete {
   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;
 }
@@ -29,7 +33,11 @@ sub update {
   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;
 }