X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=f0cb40681907d6c8ad4161c09a86586f2f11edc6;hb=afa71a988919e114101e41f0241b08ffc2f436f5;hp=034061fcf9702af07783464530d8b08545a0ceec;hpb=306bf770bf08b06f92863808b1938f2fc704acb0;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 034061f..f0cb406 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI.pm @@ -10,7 +10,7 @@ use Carp::Clan qw/^DBIx::Class/; use namespace::clean; use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07047'; +our $VERSION = '0.07048_01'; __PACKAGE__->mk_group_accessors('simple', qw/ _disable_pk_detection @@ -506,6 +506,7 @@ sub _columns_info_for { my $dbh = $self->schema->storage->dbh; my %result; + my %raw_result; if (my $sth = try { $self->_dbh_column_info($dbh, undef, $table->schema, $table->name, '%' ) }) { COL_INFO: while (my $info = try { $sth->fetchrow_hashref } catch { +{} }) { @@ -533,6 +534,7 @@ sub _columns_info_for { ) || {}; $column_info = { %$column_info, %$extra_info }; + $raw_result{$col_name} = $info; $result{$col_name} = $column_info; } $sth->finish; @@ -608,7 +610,7 @@ sub _columns_info_for { %result = %lc_result; } - return \%result; + return wantarray ? (\%result, \%raw_result) : \%result; } # Need to override this for the buggy Firebird ODBC driver.