From: zby Date: Wed, 1 Oct 2008 13:37:28 +0000 (+0000) Subject: Workaround not needed any more X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate;a=commitdiff_plain;h=046753a2be0fc177b953aaa5beee58ef771e82fe;hp=d107f6878c2cb01bc4f498657d9b954603aaae2a Workaround not needed any more --- diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm index a176f1f..de9ee41 100644 --- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm +++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm @@ -11,15 +11,7 @@ use base qw(DBIx::Class::ResultSet); sub recursive_update { my( $self, $updates ) = @_; my $object; - # this is a workaround for a bug in the svn version 4794 -# if ( ref $self->{cond} eq 'ARRAY' and ref $self->{cond}[0] eq 'SCALAR' ){ - if ( ref $self->{cond} eq 'SCALAR' ){ - $self->{cond} = {}; - $object = $self->new( {} ); - } - else { - $object = $self->find( $updates, { key => 'primary' } ) || $self->new( {} ); - } + $object = $self->find( $updates, { key => 'primary' } ) || $self->new( {} ); for my $name ( keys %$updates ){ if($object->can($name)){ diff --git a/t/var/dvdzbr.db b/t/var/dvdzbr.db index 1b86cea..6533178 100644 Binary files a/t/var/dvdzbr.db and b/t/var/dvdzbr.db differ