X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FODBC.pm;h=017d75babd24c2b6ab688c6cd1fc570e2e23ab9e;hb=c3fb509f26163ea4760053474e0ebb03f6fc98c4;hp=a221ba3beede696b2368ffecae923c121fc2922a;hpb=1abbac9a8103fff79c4ba168b3dc12f31eb4754c;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
index a221ba3..017d75b 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI';
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.04999_06';
+our $VERSION = '0.04999_09';
 
 =head1 NAME
 
@@ -35,8 +35,10 @@ sub _rebless {
     # Translate the backend name into a perl identifier
     $dbtype =~ s/\W/_/gi;
     my $class = "DBIx::Class::Schema::Loader::DBI::ODBC::${dbtype}";
-    eval { $self->ensure_class_loaded($class) };
-    bless $self, $class unless $@;
+    if ($self->load_optional_class($class) && !$self->isa($class)) {
+        bless $self, $class;
+        $self->_rebless;
+    }
   }
 }