- Storage/DBI.pm now uses Abstract internally

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Cursor.pm

diff --git a/lib/DBIx/Class/Cursor.pm b/lib/DBIx/Class/Cursor.pm
index d492ebb..3cd5505 100644 (file)
--- a/lib/DBIx/Class/Cursor.pm
+++ b/lib/DBIx/Class/Cursor.pm
@@ -2,52 +2,46 @@ package DBIx::Class::Cursor;
 
 use strict;
 use warnings;
-use overload
-        '0+'     => 'count',
-        fallback => 1;
 
 sub new {
-  my ($it_class, $db_class, $sth, $args, $cols) = @_;
-  $sth->execute(@{$args || []}) unless $sth->{Active};
+  my ($it_class, $sth, $args, $attrs) = @_;
+  #use Data::Dumper; warn Dumper(@_);
+  $it_class = ref $it_class if ref $it_class;
   my $new = {
-    class => $db_class,
     sth => $sth,
-    cols => $cols,
-    args => $args };
+    args => $args,
+    pos => 0,
+    attrs => $attrs };
   return bless ($new, $it_class);
 }
 
 sub next {
   my ($self) = @_;
-  my @row = $self->{sth}->fetchrow_array;
-  return unless @row;
-  #unless (@row) { $self->{sth}->finish; return; }
-  return $self->{class}->_row_to_object($self->{cols}, \@row);
-}
-
-sub count {
-  return scalar $_[0]->all; # So inefficient
-}
-
-sub all {
-  my ($self) = @_;
-  $self->reset;
-  my @all;
-  while (my $obj = $self->next) {
-    push(@all, $obj);
+  return if $self->{attrs}{rows}
+    && $self->{pos} >= $self->{attrs}{rows}; # + $self->{attrs}{offset});
+  unless ($self->{live_sth}) {
+    $self->{sth}->execute(@{$self->{args} || []});
+    if (my $offset = $self->{attrs}{offset}) {
+      $self->{sth}->fetch for 1 .. $offset;
+    }
+    $self->{live_sth} = 1;
   }
-  $self->reset;
-  return @all;
+  my @row = $self->{sth}->fetchrow_array;
+  $self->{pos}++ if @row;
+  return @row;
 }
 
 sub reset {
-  $_[0]->{sth}->finish if $_[0]->{sth}->{Active};
-  $_[0]->{sth}->execute(@{$_[0]->{args} || []});
-  return $_[0];
+  my ($self) = @_;
+  $self->{sth}->finish if $self->{sth}->{Active};
+  $self->{pos} = 0;
+  $self->{live_sth} = 0;
+  return $self;
 }
 
-sub first {
-  return $_[0]->reset->next;
+sub DESTROY {
+  my ($self) = @_;
+  $self->{sth}->finish if $self->{sth}->{Active};
 }
 
 1;