X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FCascadeActions.pm;h=c3a66eaba1ead1493684d66374f7e82c5a83b8cd;hb=b82c8a28bb4cb7d704496b8ce3966565d255d5b3;hp=71a28c032d2bf9a01ff968f1b3fb7c0ed41dd764;hpb=71e65b395be8133d54b110a499f9e9619111c1f6;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/CascadeActions.pm b/lib/DBIx/Class/Relationship/CascadeActions.pm
index 71a28c0..c3a66ea 100644
--- a/lib/DBIx/Class/Relationship/CascadeActions.pm
+++ b/lib/DBIx/Class/Relationship/CascadeActions.pm
@@ -1,4 +1,13 @@
-package DBIx::Class::Relationship::CascadeActions;
+package # hide from PAUSE
+    DBIx::Class::Relationship::CascadeActions;
+
+use strict;
+use warnings;
+
+our %_pod_inherit_config = 
+  (
+   class_map => { 'DBIx::Class::Relationship::CascadeActions' => 'DBIx::Class::Relationship' }
+  );
 
 sub delete {
   my ($self, @rest) = @_;
@@ -13,7 +22,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 +38,14 @@ 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}
+        &&
+      $rels{$rel}{attrs}{accessor} eq 'single'
+        &&
+      !exists($self->{_relationship_data}{$rel})
+    );
+    $_->update for grep defined, $self->$rel;
   }
   return $ret;
 }