From: Alexander Hartmaier Date: Mon, 25 Oct 2010 15:41:08 +0000 (+0200) Subject: don't try to find if not all pk col values are available X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=aba481dc507497b0c4629d8f43adc70284ac1d24;p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate don't try to find if not all pk col values are available --- diff --git a/dist.ini b/dist.ini index bb67d60..03ff85e 100644 --- a/dist.ini +++ b/dist.ini @@ -41,7 +41,6 @@ DBD::SQLite = 1.21 Readonly = 1.03 List::MoreUtils = 0.22 Carp::Clan = 6.04 -Try::Tiny = 0.07 [Prereqs / TestRequires] Test::More = 0.88 diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm index ebb29f2..f70e4fb 100644 --- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm +++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm @@ -79,26 +79,36 @@ 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 $fixed_fields{$_} } - $source->primary_columns; + grep { + ( !exists $updates->{$_} + || ( exists $updates->{$_} && !defined $updates->{$_} ) ) + && !exists $fixed_fields{$_} + } $source->primary_columns; # warn "MISSING: " . join(', ', @missing) . "\n"; if ( !defined $object && scalar @missing == 0 ) { # warn 'finding by: ' . Dumper( $updates ); use Data::Dumper; - try { - $object = $self->find( $updates, { key => 'primary' } ); - }; + $object = $self->find( $updates, { key => 'primary' } ); } + + # add the resolved columns to the updates hashref $updates = { %$updates, %$resolved }; - @missing = grep { !exists $resolved->{$_} } @missing; + # the resolved hashref might contain the pk columns + # but with an undefined value + @missing = grep { + !exists $resolved->{$_} + || ( exists $resolved->{$_} && !defined $resolved->{$_} ) + } @missing; + + #warn "MISSING2: " . join( ', ', @missing ) . "\n"; if ( !defined $object && scalar @missing == 0 ) { # warn 'finding by +resolved: ' . Dumper( $updates ); use Data::Dumper; - try { - $object = $self->find( $updates, { key => 'primary' } ); - }; + $object = $self->find( $updates, { key => 'primary' } ); } $object = $self->new( {} )