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

r5563@mccoy (orig r158):  andyg | 2005-08-29 20:16:19 +0100
Made pager a method on ResultSet, added rs->page(num) to page an ordinary RS, made rs->count store it's value
r5564@mccoy (orig r159):  andyg | 2005-08-30 19:49:11 +0100
Added tests for software-based limiting/paging, and a few related bug fixes

diff --cc lib/DBIx/Class/Storage/DBI.pm
index f579447,c24bdac..33b3e1d
--- 1/lib/DBIx/Class/Storage/DBI.pm
--- 2/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};
    }