X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FCursor.pm;h=c4c9806ba85b1bdfad438eb4b3784063720bcde4;hb=2eef86336a37040fc939429b1003cd93e7c0a360;hp=be45ce5a5286b7765214b42e77fb10c0eed7584d;hpb=a3a526ccbf65e59361a29b753f4bdd9495ad6dd5;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 be45ce5..c4c9806 100644
--- a/lib/DBIx/Class/Storage/DBI/Cursor.pm
+++ b/lib/DBIx/Class/Storage/DBI/Cursor.pm
@@ -7,6 +7,7 @@ use base qw/
   Class::Accessor::Grouped
   DBIx::Class::Cursor
 /;
+use mro 'c3';
 
 __PACKAGE__->mk_group_accessors('simple' =>
     qw/sth/
@@ -127,7 +128,7 @@ sub _dbh_all {
   my ($storage, $dbh, $self) = @_;
 
   $self->_check_dbh_gen;
-  $self->sth->finish if $self->sth->{Active};
+  $self->sth->finish if $self->sth && $self->sth->{Active};
   $self->sth(undef);
   my ($rv, $sth) = $storage->_select(@{$self->{args}});
   return @{$sth->fetchall_arrayref};