Fixxor pause indexing

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / ADO.pm

diff --git a/lib/DBIx/Class/Storage/DBI/ADO.pm b/lib/DBIx/Class/Storage/DBI/ADO.pm
index 98c1941..36423c4 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/ADO.pm
+++ b/lib/DBIx/Class/Storage/DBI/ADO.pm
@@ -32,7 +32,9 @@ sub _rebless {
 
   my $subclass = "DBIx::Class::Storage::DBI::ADO::${dbtype}";
 
-  if ($self->load_optional_class($subclass) && !$self->isa($subclass)) {
+  return if $self->isa($subclass);
+
+  if ($self->load_optional_class($subclass)) {
     bless $self, $subclass;
     $self->_rebless;
   }
@@ -64,7 +66,7 @@ sub _init {
   no warnings 'redefine';
   require DBD::ADO;
 
-  if ($DBD::ADO::VERSION <= 2.98) {
+  if (DBD::ADO->VERSION <= 2.98) {
     my $disconnect = *DBD::ADO::db::disconnect{CODE};
 
     *DBD::ADO::db::disconnect = subname 'DBD::ADO::db::disconnect' => sub {