[Bast-commits] r3486 - branches/DBIx-Class-current/lib/DBIx/Class

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2007-06-10 17:41:57 +0100 (Sun, 10 Jun 2007)
New Revision: 3486

Modified:
   branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm
Log:
slight tweak

Modified: branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm
===================================================================
--- branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm	2007-06-10 16:10:37 UTC (rev 3485)
+++ branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm	2007-06-10 16:41:57 UTC (rev 3486)
@@ -91,7 +91,6 @@
 
   if ($attrs->{page}) {
     $attrs->{rows} ||= 10;
-    $attrs->{offset} ||= ($attrs->{rows} * ($attrs->{page} - 1));
   }
 
   $attrs->{alias} ||= 'me';
@@ -936,7 +935,9 @@
   my $count = $self->_count;
   return 0 unless $count;
 
-  $count -= $self->{attrs}{offset} if $self->{attrs}{offset};
+  # need to take offset from resolved attrs
+
+  $count -= $self->{_attrs}{offset} if $self->{_attrs}{offset};
   $count = $self->{attrs}{rows} if
     $self->{attrs}{rows} and $self->{attrs}{rows} < $count;
   return $count;
@@ -1894,6 +1895,11 @@
   }
   $attrs->{collapse} = $collapse;
 
+  if ($attrs->{page}) {
+    $attrs->{offset} ||= 0;
+    $attrs->{offset} += ($attrs->{rows} * ($attrs->{page} - 1));
+  }
+
   return $self->{_attrs} = $attrs;
 }