X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSet.pm;h=a12095f2788fad9ff916c8dbbf37ac31485fe4d4;hp=e2059e5118c074687fd59f2e23c51db5ffde0c83;hb=a697fa319ce0072206b76f64fed38d92d5f59644;hpb=eb3bb737db34965596d2875f9b21bb4912a35160 diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm index e2059e5..a12095f 100644 --- a/lib/DBIx/Class/ResultSet.pm +++ b/lib/DBIx/Class/ResultSet.pm @@ -2343,10 +2343,14 @@ sub _merge_with_rscond { while ( my($col, $value) = each %implied ) { my $vref = ref $value; - if ($vref eq 'HASH') { - if (keys(%$value) && (keys %$value)[0] eq '=') { - $new_data{$col} = $value->{'='}; - } + if ( + $vref eq 'HASH' + and + keys(%$value) == 1 + and + (keys %$value)[0] eq '=' + ) { + $new_data{$col} = $value->{'='}; } elsif( !$vref or $vref eq 'SCALAR' or blessed($value) ) { $new_data{$col} = $value;