From: Matt S Trout <mst@shadowcat.co.uk>
Date: Sat, 3 Sep 2005 20:43:56 +0000 (+0000)
Subject: Merge 'DBIx-Class-joins' into 'trunk'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7bbef758093776d0121d21655d4b2c384fb1768a;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'DBIx-Class-joins' into 'trunk'
---

7bbef758093776d0121d21655d4b2c384fb1768a
diff --cc lib/DBIx/Class/Storage/DBI.pm
index c24bdac,f579447..33b3e1d
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@@ -126,10 -126,10 +126,11 @@@ sub _select 
    if (ref $condition eq 'SCALAR') {
      $order = $1 if $$condition =~ s/ORDER BY (.*)$//i;
    }
+   $ident = $self->_build_from($ident) if ref $ident;
    my @args = ('select', $attrs->{bind}, $ident, $select, $condition, $order);
 -  if ($self->sql_maker->_default_limit_syntax eq "GenericSubQ") {
 -    $attrs->{software_limit} = 1;
 +  if ($attrs->{software_limit} ||
 +      $self->sql_maker->_default_limit_syntax eq "GenericSubQ") {
 +        $attrs->{software_limit} = 1;
    } else {
      push @args, $attrs->{rows}, $attrs->{offset};
    }