X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=a7d6ddfaaf39aa07c4d99698475774e8495db569;hb=6ae3f335e1b67e8fdcb7b9a52cca64fd8c01af29;hp=8b36423c6a743f36b9247629cc7e5e1338fb6964;hpb=af99957c31fb7725daa2db213388c7ddd99fab71;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm
index 8b36423..a7d6ddf 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI.pm
@@ -5,9 +5,8 @@ use warnings;
 use base qw/DBIx::Class::Schema::Loader::Base/;
 use Class::C3;
 use Carp::Clan qw/^DBIx::Class/;
-use UNIVERSAL::require;
 
-our $VERSION = '0.04999_01';
+our $VERSION = '0.04999_07';
 
 =head1 NAME
 
@@ -39,13 +38,13 @@ sub new {
     # rebless to vendor-specific class if it exists and loads
     my $dbh = $self->schema->storage->dbh;
     my $driver = $dbh->{Driver}->{Name};
+
     my $subclass = 'DBIx::Class::Schema::Loader::DBI::' . $driver;
-    $subclass->require;
-    if($@ && $@ !~ /^Can't locate /) {
-        croak "Failed to require $subclass: $@";
-    }
-    elsif(!$@) {
-        bless $self, "DBIx::Class::Schema::Loader::DBI::${driver}";
+    if ($self->ensure_class_found($subclass)) {
+        eval { $self->ensure_class_loaded($subclass) };
+        croak "Failed to load $subclass: $@" if $@;
+        bless $self, $subclass unless $self->isa($subclass);
+        $self->_rebless();
     }
 
     # Set up the default quoting character and name seperators
@@ -71,6 +70,9 @@ sub new {
 # Override this in vendor modules to do things at the end of ->new()
 sub _setup { }
 
+# Override this in vendor module to load a subclass if necessary
+sub _rebless { }
+
 # Returns an array of table names
 sub _tables_list { 
     my $self = shift;
@@ -169,8 +171,8 @@ sub _table_fk_info {
     my ($self, $table) = @_;
 
     my $dbh = $self->schema->storage->dbh;
-    my $sth = $dbh->foreign_key_info( '', '', '', '',
-        $self->db_schema, $table );
+    my $sth = $dbh->foreign_key_info( '', $self->db_schema, '',
+                                      '', $self->db_schema, $table );
     return [] if !$sth;
 
     my %rels;
@@ -212,7 +214,6 @@ sub _columns_info_for {
         my %result;
         eval {
             my $sth = $dbh->column_info( undef, $self->db_schema, $table, '%' );
-            $sth->execute();
             while ( my $info = $sth->fetchrow_hashref() ){
                 my %column_info;
                 $column_info{data_type}   = $info->{TYPE_NAME};
@@ -222,7 +223,9 @@ sub _columns_info_for {
                 my $col_name = $info->{COLUMN_NAME};
                 $col_name =~ s/^\"(.*)\"$/$1/;
 
-                $result{$col_name} = \%column_info;
+                my $extra_info = $self->_extra_column_info($info) || {};
+
+                $result{$col_name} = { %column_info, %$extra_info };
             }
             $sth->finish;
         };
@@ -247,7 +250,9 @@ sub _columns_info_for {
             $column_info{size}    = $2;
         }
 
-        $result{$columns[$i]} = \%column_info;
+        my $extra_info = $self->_extra_column_info($table, $columns[$i], $sth, $i) || {};
+
+        $result{$columns[$i]} = { %column_info, %$extra_info };
     }
     $sth->finish;
 
@@ -265,6 +270,10 @@ sub _columns_info_for {
     return \%result;
 }
 
+# Override this in vendor class to return any additional column
+# attributes
+sub _extra_column_info {}
+
 =head1 SEE ALSO
 
 L<DBIx::Class::Schema::Loader>