X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=0dd8b25024d6c8d7b66660fff19ad43aece4e14c;hb=acf322c17457a4d0331fe0ada22c4c54d489ddd2;hp=d29f8e775cc1852c3afdc09c8c50e25759531265;hpb=c5baf1311f0c3f5dc3c12197190b41205989c11d;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 d29f8e7..0dd8b25 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI.pm
@@ -7,7 +7,7 @@ use Class::C3;
 use Carp::Clan qw/^DBIx::Class/;
 use UNIVERSAL::require;
 
-our $VERSION = '0.04999_01';
+our $VERSION = '0.04999_02';
 
 =head1 NAME
 
@@ -169,8 +169,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;
@@ -222,15 +222,9 @@ sub _columns_info_for {
                 my $col_name = $info->{COLUMN_NAME};
                 $col_name =~ s/^\"(.*)\"$/$1/;
 
-                if ($self->_column_is_auto_increment($info)) {
-                    $column_info{is_auto_increment} = 1;
-                }
+                my $extra_info = $self->_extra_column_info($info) || {};
 
-                if (my $extra = $self->_column_extra_attr($info)) {
-                    $column_info{extra} = $extra;
-                }
-
-                $result{$col_name} = \%column_info;
+                $result{$col_name} = { %column_info, %$extra_info };
             }
             $sth->finish;
         };
@@ -255,15 +249,9 @@ sub _columns_info_for {
             $column_info{size}    = $2;
         }
 
-        if ($self->_column_is_auto_increment($table, $columns[$i], $sth, $i)) {
-            $column_info{is_auto_increment} = 1;
-        }
+        my $extra_info = $self->_extra_column_info($table, $columns[$i], $sth, $i) || {};
 
-        if (my $extra = $self->_column_extra_attr($table, $columns[$i], $sth, $i)) {
-            $column_info{extra} = $extra;
-        }
-
-        $result{$columns[$i]} = \%column_info;
+        $result{$columns[$i]} = { %column_info, %$extra_info };
     }
     $sth->finish;
 
@@ -281,12 +269,9 @@ sub _columns_info_for {
     return \%result;
 }
 
-# Override this in vendor class to return whether a column is
-# auto-incremented
-sub _column_is_auto_increment {}
-
-# Override this in vendor class to return any "extra" column attributes
-sub _column_extra_attr {}
+# Override this in vendor class to return any additional column
+# attributes
+sub _extra_column_info {}
 
 =head1 SEE ALSO