X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FImaDBI.pm;h=556f2111dd005d43c92c48d57656407bffb8033f;hb=438adc0ee84a273f4673ad3e8e6830657bdf1142;hp=f659983e16be752db984ed5742e23bd0dd183713;hpb=d00123a33ffe64089368aa491f66709a5bef16ab;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/CDBICompat/ImaDBI.pm b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
index f659983..556f211 100644
--- a/lib/DBIx/Class/CDBICompat/ImaDBI.pm
+++ b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
@@ -47,7 +47,9 @@ __PACKAGE__->mk_classdata('_transform_sql_handlers' =>
           _aliases => { self => $from, foreign => $to },
           _action => 'join',
         };
-        my $join = $from_class->_cond_resolve($rel_obj->{cond}, $attrs);
+        my $join = $from_class->storage->sql_maker->where(
+          $from_class->resolve_condition($rel_obj->{cond}, $attrs) );
+        $join =~ s/^\s*WHERE//i;
         return $join;
       }
         
@@ -109,6 +111,7 @@ sub transform_sql {
     my $h = $class->_transform_sql_handlers->{$key};
     $sql =~ s/__$key(?:\(([^\)]+)\))?__/$h->($attrs, $class, $1)/eg;
   }
+  #warn $sql;
   return sprintf($sql, @args);
 }