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=6e6dd40e642d4d71d64749a119a2c52005c04a11;hpb=28b4691da7f640a8df40780bdac200b513cf132d;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 6e6dd40..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.04001'; +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,7 +222,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 +249,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 +269,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