From e370544994a3bd3de867b19215096c45118a00f5 Mon Sep 17 00:00:00 2001 From: Alexander Hartmaier Date: Wed, 27 Oct 2010 10:16:25 +0200 Subject: [PATCH] simplified missing pk column detection --- lib/DBIx/Class/ResultSet/RecursiveUpdate.pm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm index f70e4fb..1d61681 100644 --- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm +++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm @@ -79,14 +79,12 @@ sub recursive_update { my %fixed_fields = map { $_ => 1 } @$fixed_fields if $fixed_fields; + # the updates hashref might contain the pk columns # but with an undefined value my @missing = - grep { - ( !exists $updates->{$_} - || ( exists $updates->{$_} && !defined $updates->{$_} ) ) - && !exists $fixed_fields{$_} - } $source->primary_columns; + grep { !defined $updates->{$_} && !exists $fixed_fields{$_} } + $source->primary_columns; # warn "MISSING: " . join(', ', @missing) . "\n"; if ( !defined $object && scalar @missing == 0 ) { @@ -97,12 +95,10 @@ sub recursive_update { # add the resolved columns to the updates hashref $updates = { %$updates, %$resolved }; + # the resolved hashref might contain the pk columns # but with an undefined value - @missing = grep { - !exists $resolved->{$_} - || ( exists $resolved->{$_} && !defined $resolved->{$_} ) - } @missing; + @missing = grep { !defined $resolved->{$_} } @missing; #warn "MISSING2: " . join( ', ', @missing ) . "\n"; if ( !defined $object && scalar @missing == 0 ) { -- 2.45.2