From: Peter Rabbitson <ribasushi@cpan.org>
Date: Thu, 4 Sep 2014 22:59:01 +0000 (+0200)
Subject: Make sure the resolve_cond shim attempts to lint the right thing
X-Git-Tag: v0.082800~62
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e65228c03ac1a399f32a9c527d7036353360ee91;p=dbsrgits%2FDBIx-Class.git

Make sure the resolve_cond shim attempts to lint the right thing

This only matters in compat mode, so sod testing
---

diff --git a/lib/DBIx/Class/ResultSource.pm b/lib/DBIx/Class/ResultSource.pm
index 6820542..bf2a0d4 100644
--- a/lib/DBIx/Class/ResultSource.pm
+++ b/lib/DBIx/Class/ResultSource.pm
@@ -1809,7 +1809,7 @@ sub _resolve_condition {
 
   # _resolve_relationship_condition always returns qualified cols even in the
   # case of join_free_condition, but nothing downstream expects this
-  if (ref $res[0] eq 'HASH' and ($is_objlike[0] or $is_objlike[1]) ) {
+  if ($rc->{join_free_condition} and ref $res[0] eq 'HASH') {
     $res[0] = { map
       { ($_ =~ /\.(.+)/) => $res[0]{$_} }
       keys %{$res[0]}