use mro 'c3';
use Sub::Name;
+use Try::Tiny;
use namespace::clean;
=head1 NAME
=cut
-sub _rebless {
- my $self = shift;
-
- my $dbtype = $self->_dbh_get_info(17);
-
- if (not $dbtype) {
- 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}";
-
- 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";
- }
-}
+sub _rebless { shift->_determine_connector_driver('ADO') }
# cleanup some warnings from DBD::ADO
# RT#65563, not fixed as of DBD::ADO v2.98
}
# Monkeypatch out the horrible warnings during global destruction.
-# A patch to DBD::ADO has been submitted as well.
+# 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 {
- 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/;
+ 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->(@_);
};
- $disconnect->(@_);
- };
+ }
+
+ $DBD::ADO::__DBIC_MONKEYPATCH_CHECKED__ = 1;
}
}