package DBIx::Class::Storage::DBI::Cursor;
-use base qw/DBIx::Class::Cursor/;
-
use strict;
use warnings;
+use base qw/DBIx::Class::Cursor/;
+
+use Try::Tiny;
+use namespace::clean;
+
+__PACKAGE__->mk_group_accessors('simple' =>
+ qw/sth storage args pos attrs _dbh_gen/
+);
+
=head1 NAME
DBIx::Class::Storage::DBI::Cursor - Object representing a query cursor on a
=head2 new
-=back
-
Returns a new L<DBIx::Class::Storage::DBI::Cursor> object.
=cut
sub new {
my ($class, $storage, $args, $attrs) = @_;
- #use Data::Dumper; warn Dumper(@_);
$class = ref $class if ref $class;
+
my $new = {
storage => $storage,
args => $args,
pos => 0,
attrs => $attrs,
- pid => $$,
+ _dbh_gen => $storage->{_dbh_gen},
};
- $new->{tid} = threads->tid if $INC{'threads.pm'};
-
return bless ($new, $class);
}
=back
-Advances the cursor to the next row and returns an arrayref of column values.
+Advances the cursor to the next row and returns an array of column
+values (the result of L<DBI/fetchrow_array> method).
=cut
-sub next {
- my ($self) = @_;
-
- $self->_check_forks_threads;
- if ($self->{attrs}{rows} && $self->{pos} >= $self->{attrs}{rows}) {
- $self->{sth}->finish if $self->{sth}->{Active};
- delete $self->{sth};
+sub _dbh_next {
+ my ($storage, $dbh, $self) = @_;
+
+ $self->_check_dbh_gen;
+ if (
+ $self->{attrs}{software_limit}
+ && $self->{attrs}{rows}
+ && $self->{pos} >= $self->{attrs}{rows}
+ ) {
+ $self->sth->finish if $self->sth->{Active};
+ $self->sth(undef);
$self->{done} = 1;
}
return if $self->{done};
- unless ($self->{sth}) {
- $self->{sth} = ($self->{storage}->_select(@{$self->{args}}))[1];
+ unless ($self->sth) {
+ $self->sth(($storage->_select(@{$self->{args}}))[1]);
if ($self->{attrs}{software_limit}) {
if (my $offset = $self->{attrs}{offset}) {
- $self->{sth}->fetch for 1 .. $offset;
+ $self->sth->fetch for 1 .. $offset;
}
}
}
- my @row = $self->{sth}->fetchrow_array;
+ my @row = $self->sth->fetchrow_array;
if (@row) {
$self->{pos}++;
} else {
- delete $self->{sth};
+ $self->sth(undef);
$self->{done} = 1;
}
return @row;
}
+sub next {
+ my ($self) = @_;
+ $self->{storage}->dbh_do($self->can('_dbh_next'), $self);
+}
+
=head2 all
=over 4
=cut
+sub _dbh_all {
+ my ($storage, $dbh, $self) = @_;
+
+ $self->_check_dbh_gen;
+ $self->sth->finish if $self->sth && $self->sth->{Active};
+ $self->sth(undef);
+ my ($rv, $sth) = $storage->_select(@{$self->{args}});
+ return @{$sth->fetchall_arrayref};
+}
+
sub all {
my ($self) = @_;
+ if ($self->{attrs}{software_limit}
+ && ($self->{attrs}{offset} || $self->{attrs}{rows})) {
+ return $self->next::method;
+ }
- $self->_check_forks_threads;
- return $self->SUPER::all if $self->{attrs}{rows};
- $self->{sth}->finish if $self->{sth}->{Active};
- delete $self->{sth};
- my ($rv, $sth) = $self->{storage}->_select(@{$self->{args}});
- return @{$sth->fetchall_arrayref};
+ $self->{storage}->dbh_do($self->can('_dbh_all'), $self);
}
=head2 reset
-=back
-
Resets the cursor to the beginning of the L<DBIx::Class::ResultSet>.
=cut
sub reset {
my ($self) = @_;
- $self->_check_forks_threads;
- $self->{sth}->finish if $self->{sth}->{Active};
+ # No need to care about failures here
+ try { $self->sth->finish }
+ if $self->sth && $self->sth->{Active};
$self->_soft_reset;
+ return undef;
}
sub _soft_reset {
my ($self) = @_;
- delete $self->{sth};
- $self->{pos} = 0;
+ $self->sth(undef);
delete $self->{done};
- return $self;
+ $self->{pos} = 0;
}
-sub _check_forks_threads {
+sub _check_dbh_gen {
my ($self) = @_;
- if($INC{'threads.pm'} && $self->{tid} != threads->tid) {
- $self->_soft_reset;
- $self->{tid} = threads->tid;
- }
-
- if($self->{pid} != $$) {
- $self->_soft_reset;
- $self->{pid} = $$;
+ if($self->{_dbh_gen} != $self->{storage}->{_dbh_gen}) {
+ $self->{_dbh_gen} = $self->{storage}->{_dbh_gen};
+ $self->_soft_reset;
}
}
sub DESTROY {
- my ($self) = @_;
-
- $self->_check_forks_threads;
- $self->{sth}->finish if $self->{sth}->{Active};
+ # None of the reasons this would die matter if we're in DESTROY anyways
+ if (my $sth = $_[0]->sth) {
+ try { $sth->finish } if $sth->FETCH('Active');
+ }
}
1;