Comprehensive MSAccess support over both DBD::ODBC and DBD::ADO

[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 773bdd6..8c64735 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/ADO.pm
+++ b/lib/DBIx/Class/Storage/DBI/ADO.pm
@@ -3,6 +3,9 @@ package DBIx::Class::Storage::DBI::ADO;
 use base 'DBIx::Class::Storage::DBI';
 use mro 'c3';
 
+use Sub::Name;
+use namespace::clean;
+
 =head1 NAME
 
 DBIx::Class::Storage::DBI::ADO - Support for L<DBD::ADO>
@@ -29,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;
   }
@@ -54,6 +59,27 @@ sub _dbh_get_info {
   $self->next::method(@_);
 }
 
+# Monkeypatch out the horrible warnings during global destruction.
+# A patch to DBD::ADO has been submitted as well.
+# https://rt.cpan.org/Ticket/Display.html?id=65563
+sub _init {
+  no warnings 'redefine';
+  require DBD::ADO;
+
+  if ($DBD::ADO::VERSION <= 2.98) {
+    my $disconnect = *DBD::ADO::db::disconnect{CODE};
+
+    *DBD::ADO::db::disconnect = subname 'DBD::ADO::db::disconnect' => sub {
+      my $warn_handler = $SIG{__WARN__} || sub { warn @_ };
+      local $SIG{__WARN__} = sub {
+        $warn_handler->(@_)
+          unless $_[0] =~ /Not a Win32::OLE object|uninitialized value/;
+      };
+      $disconnect->(@_);
+    };
+  }
+}
+
 # Here I was just experimenting with ADO cursor types, left in as a comment in
 # case you want to as well. See the DBD::ADO docs.
 #sub _dbh_sth {