Probably avoids some potential page/search bugs

diff --git a/lib/DBIx/Class/CDBICompat/Pager.pm b/lib/DBIx/Class/CDBICompat/Pager.pm
index a2099aa..c3d773c 100644 (file)
--- a/lib/DBIx/Class/CDBICompat/Pager.pm
+++ b/lib/DBIx/Class/CDBICompat/Pager.pm
@@ -9,7 +9,7 @@ sub page {
   my $class = shift;\r
 \r
   my $rs = $class->search(@_);\r
-  unless ($rs->{attrs}{page}) {\r
+  unless ($rs->{page}) {\r
     $rs = $rs->page(1);\r
   }\r
   return ( $rs->pager, $rs );\r

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 340e4c5..6364054 100644 (file)
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -79,10 +79,10 @@ sub new {
     cond => $attrs->{where},
     from => $attrs->{from},
     count => undef,
+    page => delete $attrs->{page},
     pager => undef,
     attrs => $attrs };
   bless ($new, $class);
-  #$new->pager if $attrs->{page};
   return $new;
 }
 
@@ -339,11 +339,11 @@ sense for queries with page turned on.
 sub pager {
   my ($self) = @_;
   my $attrs = $self->{attrs};
-  die "Can't create pager for non-paged rs" unless $attrs->{page};
+  die "Can't create pager for non-paged rs" unless $self->{page};
   $attrs->{rows} ||= 10;
   $self->count;
   return $self->{pager} ||= Data::Page->new(
-    $self->{count}, $attrs->{rows}, $attrs->{page});
+    $self->{count}, $attrs->{rows}, $self->{page});
 }
 
 =head2 page($page_num)