X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=c7539eccaafda86809956f3f0a97f595547201ac;hb=f671b6308c4f2210255b2eaa12fc47a49621d436;hp=19d20faf12a0d8cbc0a5463c633c4074fec3b30e;hpb=942bd5e02cb04afd992bb66c048de6f797c2568a;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 19d20fa..c7539ec 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI.pm @@ -6,7 +6,7 @@ use base qw/DBIx::Class::Schema::Loader::Base/; use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; -our $VERSION = '0.07001'; +our $VERSION = '0.07002'; =head1 NAME @@ -285,7 +285,12 @@ sub _columns_info_for { if ($dbh->can('column_info')) { my %result; eval { - my $sth = eval { local $SIG{__WARN__} = sub {}; $dbh->column_info( undef, $self->db_schema, $table, '%' ); }; + my $sth = do { + # FIXME - seems to only warn on MySQL, and even then the output is valuable + # need to figure out how no to mask it away (and still have tests pass) + local $SIG{__WARN__} = sub {}; + $dbh->column_info( undef, $self->db_schema, $table, '%' ); + }; while ( my $info = $sth->fetchrow_hashref() ){ my $column_info = {}; $column_info->{data_type} = lc $info->{TYPE_NAME}; @@ -313,7 +318,8 @@ sub _columns_info_for { } $sth->finish; }; - return \%result if !$@ && scalar keys %result; + + return \%result if !$@ && scalar keys %result; } my %result;