X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FODBC.pm;h=40c32b6415d0c2a080c784e8ebe2ab78abf2fd2a;hb=dc783fab900d073db1fb0e86b709cbb65bd364b7;hp=052639f03fd9c8153de7991839cdd76c42775912;hpb=e42ec4ef998118c71f8bd66e765f597a6f74dd39;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 052639f..40c32b6 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
@@ -3,10 +3,9 @@ package DBIx::Class::Schema::Loader::DBI::ODBC;
 use strict;
 use warnings;
 use base 'DBIx::Class::Schema::Loader::DBI';
-use Carp::Clan qw/^DBIx::Class/;
-use Class::C3;
+use mro 'c3';
 
-our $VERSION = '0.05003';
+our $VERSION = '0.07045';
 
 =head1 NAME
 
@@ -23,40 +22,35 @@ See L<DBIx::Class::Schema::Loader::Base> for usage information.
 =cut
 
 sub _rebless {
-  my $self = shift;
-
-  return if ref $self ne __PACKAGE__;
-
-# stolen from DBIC ODBC storage
-  my $dbh  = $self->schema->storage->dbh;
-  my $dbtype = eval { $dbh->get_info(17) };
-  unless ( $@ ) {
-    # Translate the backend name into a perl identifier
-    $dbtype =~ s/\W/_/gi;
-    my $class = "DBIx::Class::Schema::Loader::DBI::ODBC::${dbtype}";
-    if ($self->load_optional_class($class) && !$self->isa($class)) {
-        bless $self, $class;
-        $self->_rebless;
-    }
-  }
-}
-
-sub _tables_list { 
     my $self = shift;
 
-    return $self->next::method(undef, undef);
+    return if ref $self ne __PACKAGE__;
+
+    # stolen from DBIC ODBC storage
+    my $dbh  = $self->schema->storage->dbh;
+    my $dbtype = eval { $dbh->get_info(17) };
+    unless ( $@ ) {
+        # Translate the backend name into a perl identifier
+        $dbtype =~ s/\W/_/gi;
+        my $class = "DBIx::Class::Schema::Loader::DBI::ODBC::${dbtype}";
+        if ($self->load_optional_class($class) && !$self->isa($class)) {
+            bless $self, $class;
+            $self->_rebless;
+        }
+    }
 }
 
 =head1 SEE ALSO
 
 L<DBIx::Class::Schema::Loader::DBI::ODBC::Microsoft_SQL_Server>,
-L<DBIx::Class::Schema::Loader::DBI::MSSQL>,
+L<DBIx::Class::Schema::Loader::DBI::ODBC::SQL_Anywhere>,
+L<DBIx::Class::Schema::Loader::DBI::ODBC::Firebird>,
 L<DBIx::Class::Schema::Loader>, L<DBIx::Class::Schema::Loader::Base>,
 L<DBIx::Class::Schema::Loader::DBI>
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+See L<DBIx::Class::Schema::Loader/AUTHORS>.
 
 =head1 LICENSE