X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FCursor.pm;h=c9dedf652d127640448d4dd1301fcb6ede29ed3c;hb=a71859b4494bebdf765903546d332f9f3f805810;hp=a63b2a64c4a3e1b0d50fa9cbe95f2d4a61247473;hpb=ebc77b538ae411ffc5a5e6451eded2f5d999f2cb;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/Storage/DBI/Cursor.pm b/lib/DBIx/Class/Storage/DBI/Cursor.pm index a63b2a6..c9dedf6 100644 --- a/lib/DBIx/Class/Storage/DBI/Cursor.pm +++ b/lib/DBIx/Class/Storage/DBI/Cursor.pm @@ -30,8 +30,6 @@ information. =head2 new -=back - Returns a new L object. =cut @@ -45,11 +43,9 @@ sub new { args => $args, pos => 0, attrs => $attrs, - pid => $$, + _dbh_gen => $storage->{_dbh_gen}, }; - $new->{tid} = threads->tid if $INC{'threads.pm'}; - return bless ($new, $class); } @@ -67,10 +63,10 @@ Advances the cursor to the next row and returns an arrayref of column values. =cut -sub next { - my ($self) = @_; +sub _dbh_next { + my ($storage, $dbh, $self) = @_; - $self->_check_forks_threads; + $self->_check_dbh_gen; if ($self->{attrs}{rows} && $self->{pos} >= $self->{attrs}{rows}) { $self->{sth}->finish if $self->{sth}->{Active}; delete $self->{sth}; @@ -78,7 +74,7 @@ sub next { } return if $self->{done}; unless ($self->{sth}) { - $self->{sth} = ($self->{storage}->_select(@{$self->{args}}))[1]; + $self->{sth} = ($storage->_select(@{$self->{args}}))[1]; if ($self->{attrs}{software_limit}) { if (my $offset = $self->{attrs}{offset}) { $self->{sth}->fetch for 1 .. $offset; @@ -95,6 +91,11 @@ sub next { return @row; } +sub next { + my ($self) = @_; + $self->{storage}->dbh_do($self->can('_dbh_next'), $self); +} + =head2 all =over 4 @@ -110,20 +111,23 @@ L. =cut -sub all { - my ($self) = @_; +sub _dbh_all { + my ($storage, $dbh, $self) = @_; - $self->_check_forks_threads; - return $self->SUPER::all if $self->{attrs}{rows}; + $self->_check_dbh_gen; $self->{sth}->finish if $self->{sth}->{Active}; delete $self->{sth}; - my ($rv, $sth) = $self->{storage}->_select(@{$self->{args}}); + my ($rv, $sth) = $storage->_select(@{$self->{args}}); return @{$sth->fetchall_arrayref}; } -=head2 reset +sub all { + my ($self) = @_; + return $self->SUPER::all if $self->{attrs}{rows}; + $self->{storage}->dbh_do($self->can('_dbh_all'), $self); +} -=back +=head2 reset Resets the cursor to the beginning of the L. @@ -132,8 +136,8 @@ Resets the cursor to the beginning of the L. sub reset { my ($self) = @_; - $self->_check_forks_threads; - $self->{sth}->finish if $self->{sth}->{Active}; + # No need to care about failures here + eval { $self->{sth}->finish if $self->{sth} && $self->{sth}->{Active} }; $self->_soft_reset; } @@ -141,30 +145,25 @@ sub _soft_reset { my ($self) = @_; delete $self->{sth}; - $self->{pos} = 0; delete $self->{done}; + $self->{pos} = 0; return $self; } -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 + eval { $self->{sth}->finish if $self->{sth} && $self->{sth}->{Active} }; } 1;