[Bast-commits] r4867 - in DBIx-Class-ResultSet-RecursiveUpdate/1.000/trunk: lib/DBIx/Class/ResultSet t/var

[zby at dev.catalyst.perl.org]

Author: zby
Date: 2008-10-01 14:37:28 +0100 (Wed, 01 Oct 2008)
New Revision: 4867

Modified:
   DBIx-Class-ResultSet-RecursiveUpdate/1.000/trunk/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
   DBIx-Class-ResultSet-RecursiveUpdate/1.000/trunk/t/var/dvdzbr.db
Log:
Workaround not needed any more

Modified: DBIx-Class-ResultSet-RecursiveUpdate/1.000/trunk/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
===================================================================
--- DBIx-Class-ResultSet-RecursiveUpdate/1.000/trunk/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm	2008-10-01 09:50:25 UTC (rev 4866)
+++ DBIx-Class-ResultSet-RecursiveUpdate/1.000/trunk/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm	2008-10-01 13:37:28 UTC (rev 4867)
@@ -11,15 +11,7 @@
 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)){

Modified: DBIx-Class-ResultSet-RecursiveUpdate/1.000/trunk/t/var/dvdzbr.db
===================================================================
(Binary files differ)