Merge 'trunk' into 'DBIx-Class-current'

[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 aa88043..3d5da76 100644 (file)
--- a/lib/DBIx/Class/Relationship/CascadeActions.pm
+++ b/lib/DBIx/Class/Relationship/CascadeActions.pm
@@ -33,6 +33,10 @@ sub update {
   my %rels = map { $_ => $source->relationship_info($_) } $source->relationships;
   my @cascade = grep { $rels{$_}{attrs}{cascade_update} } keys %rels;
   foreach my $rel (@cascade) {
+    next if (
+      $rels{$rel}{attrs}{accessor} eq 'single'
+      && !exists($self->{_relationship_data}{$rel})
+    );
     $_->update for grep defined, $self->$rel;
   }
   return $ret;