From: Rafael Kitover <rkitover@cpan.org>
Date: Sat, 19 Feb 2011 17:14:16 +0000 (-0500)
Subject: Display a warning when an ODBC or ADO subclass is not found
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ab17c17561437a571ef9fc8e75bafbca54afae3c;p=dbsrgits%2FDBIx-Class-Historic.git

Display a warning when an ODBC or ADO subclass is not found
---

diff --git a/Changes b/Changes
index 3656835..9b2f887 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,9 @@ Revision history for DBIx::Class
         - Add quote_names connection option. When set to true automatically
           sets quote_char and name_sep appropriate for your RDBMS
         - IC::DateTime support for MSSQL over DBD::ADO
+        - Both the ::ODBC and ::ADO dispatchers now warn if a rdbms-specific
+          driver is not found for this connection before falling back to
+          plain ::Storage::DBI
 
     * Fixes
         - Disable mysql_auto_reconnect for MySQL - depending on the ENV
diff --git a/lib/DBIx/Class/Storage/DBI/ADO.pm b/lib/DBIx/Class/Storage/DBI/ADO.pm
index 91d731c..773bdd6 100644
--- a/lib/DBIx/Class/Storage/DBI/ADO.pm
+++ b/lib/DBIx/Class/Storage/DBI/ADO.pm
@@ -2,8 +2,6 @@ package DBIx::Class::Storage::DBI::ADO;
 
 use base 'DBIx::Class::Storage::DBI';
 use mro 'c3';
-use Try::Tiny;
-use namespace::clean;
 
 =head1 NAME
 
@@ -23,16 +21,22 @@ sub _rebless {
   my $dbtype = $self->_dbh_get_info(17);
 
   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)) {
     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
diff --git a/lib/DBIx/Class/Storage/DBI/ODBC.pm b/lib/DBIx/Class/Storage/DBI/ODBC.pm
index 15fff7b..8f0b418 100644
--- a/lib/DBIx/Class/Storage/DBI/ODBC.pm
+++ b/lib/DBIx/Class/Storage/DBI/ODBC.pm
@@ -1,17 +1,13 @@
 package DBIx::Class::Storage::DBI::ODBC;
 use strict;
 use warnings;
-
 use base qw/DBIx::Class::Storage::DBI/;
 use mro 'c3';
-use Try::Tiny;
-use namespace::clean;
 
 sub _rebless {
   my ($self) = @_;
 
-  if (my $dbtype = try { $self->_get_dbh->get_info(17) }) {
-
+  if (my $dbtype = $self->_dbh_get_info(17)) {
     # Translate the backend name into a perl identifier
     $dbtype =~ s/\W/_/gi;
     my $subclass = "DBIx::Class::Storage::DBI::ODBC::${dbtype}";
@@ -20,6 +16,13 @@ sub _rebless {
       bless $self, $subclass;
       $self->_rebless;
     }
+    else {
+      warn "Expected driver '$subclass' not found, using generic support. " .
+           "Please file an RT.\n";
+    }
+  }
+  else {
+    warn "Could not determine your database type, using generic support.\n";
   }
 }
 
@@ -34,12 +37,13 @@ DBIx::Class::Storage::DBI::ODBC - Base class for ODBC drivers
 This class simply provides a mechanism for discovering and loading a sub-class
 for a specific ODBC backend.  It should be transparent to the user.
 
-=head1 AUTHORS
+=head1 AUTHOR
 
-Marc Mims C<< <marc@questright.com> >>
+See L<DBIx::Class/AUTHOR> and L<DBIx::Class/CONTRIBUTORS>.
 
 =head1 LICENSE
 
 You may distribute this code under the same terms as Perl itself.
 
 =cut
+# vim:sts=2 sw=2: