Merge branch 'master' into topic/constructor_rewrite

[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 91d731c..8cca22d 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/ADO.pm
+++ b/lib/DBIx/Class/Storage/DBI/ADO.pm
@@ -2,6 +2,8 @@ package DBIx::Class::Storage::DBI::ADO;
 
 use base 'DBIx::Class::Storage::DBI';
 use mro 'c3';
+
+use Sub::Name;
 use Try::Tiny;
 use namespace::clean;
 
@@ -20,19 +22,27 @@ should be transparent to the user.
 sub _rebless {
   my $self = shift;
 
-  my $dbtype = $self->_dbh_get_info(17);
+  my $dbtype = $self->_dbh_get_info('SQL_DBMS_NAME');
 
   if (not $dbtype) {
-    warn 'Unable to determine ADO driver, failling back to generic support';
+    warn "Unable to determine ADO driver, failling back to generic support.\n";
     return;
   }
 
   $dbtype =~ s/\W/_/gi;
+
   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;
   }
+  else {
+    warn "Expected driver '$subclass' not found, using generic support. " .
+         "Please file an RT.\n";
+  }
 }
 
 # cleanup some warnings from DBD::ADO
@@ -50,6 +60,32 @@ 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, and it was fixed
+# as of 2.99
+# https://rt.cpan.org/Ticket/Display.html?id=65563
+sub _init {
+  unless ($DBD::ADO::__DBIC_MONKEYPATCH_CHECKED__) {
+    require DBD::ADO;
+
+    unless (try { DBD::ADO->VERSION('2.99'); 1 }) {
+      no warnings 'redefine';
+      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->(@_);
+      };
+    }
+
+    $DBD::ADO::__DBIC_MONKEYPATCH_CHECKED__ = 1;
+  }
+}
+
 # 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 {