From 046753a2be0fc177b953aaa5beee58ef771e82fe Mon Sep 17 00:00:00 2001 From: zby Date: Wed, 1 Oct 2008 13:37:28 +0000 Subject: [PATCH] Workaround not needed any more --- lib/DBIx/Class/ResultSet/RecursiveUpdate.pm | 10 +--------- t/var/dvdzbr.db | Bin 26624 -> 26624 bytes 2 files changed, 1 insertion(+), 9 deletions(-) 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 1b86cea40f1c74a2199cb70b0e1907a6a07ea175..653317848fe24f1a139b9e09ad50deee2d629ccf 100644 GIT binary patch delta 532 zcmZ{gy-yoK5XE(~b5>0|AAacQn0SVJk;ffAn zO-C2nPyp8;s`&#bP6$DRh#*B$Q2-SU**jM#$`<=}-~2|JH#-5}3HW|n^L&}rPu7ZN ztpDl6y8uHm`*kUCDy2*t$TJ`~ggw}TC76X#$e&b`Fqt-nbun(yN~yfjxwcR)bq=Yt z{?{E;DaWuJ;})JRZB`}xV(KxyFI2<2GOLa9*vU+oW&HDI*lVNpk_ zg;Q7mE|*h+48C>W3HpFPdo~2QIMZ7c6vOYm+kzVKW1lA|j>p9eE*HlICG7LdX?{`) z%3!U~h6i2(v)?+f<_!pHMDlh8C2?Y4MNku-O|8gkKQ*H}^+Q%2O5xRKTTkPBVMtJm zUn?xi9tT*i5@lPjlw6z3z$JqlxP%vYgg@{K4{+-@$#ZCwz_|LtyDMz+g3d4`mUEE8GUsc-7{*r&LN<~*v;z52iKbMI0vA5ORa E1%>*Ae*gdg delta 486 zcmZ{gJxr5P6o&7;=l=93HMG`-0@9LdG3f`DT7I-9I5>!=jV3N2B&g{Eq9miN#JXdcUuegJ-z!J?D9c^PZh1-D%Rjkp-73a2 zA}sNV|5iwNNQ_VeUl&Vdm)Rx%%1}gsP(Z0-LK=}w2uJLnqdkZ!@F-3ls9cpy4%F_% zVuI;u{Bx(nbQ&-2ZZmx!UnL7n&)|Nt!gL02Pg+br!0&|!ZWNv}oi*R(qkAtn(~q&1 z9>K5H4UE1Y!6~3l zzvBr3Bvy9wd@2`x&c&cj;0Ls!57%%7zoBOb`3ZPA5UQL9yYq>Vf)+8X4?Wj)4lUzq v05)?%Dks0NySZO*Q+b?5xg#kDhq+vw2rzf8Z-X^I{4eX9e?n~>yd3@u3PgfK -- 2.43.0