X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=cc8f0bb32b26e0393c67dc7fca1e5fdce2c07d2d;hb=c8845f2e67c636fbfb597a4562847cc80c4e5f28;hp=c7539eccaafda86809956f3f0a97f595547201ac;hpb=f671b6308c4f2210255b2eaa12fc47a49621d436;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 c7539ec..cc8f0bb 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI.pm @@ -5,8 +5,17 @@ use warnings; use base qw/DBIx::Class::Schema::Loader::Base/; use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; +use Try::Tiny; +use namespace::clean; -our $VERSION = '0.07002'; +our $VERSION = '0.07009'; + +__PACKAGE__->mk_group_accessors('simple', qw/ + _disable_pk_detection + _disable_uniq_detection + _disable_fk_detection + _passwords +/); =head1 NAME @@ -122,18 +131,20 @@ sub _filter_tables { @tables = grep { /$constraint/ } @$tables if defined $constraint; @tables = grep { ! /$exclude/ } @$tables if defined $exclude; - for my $table (@tables) { - eval { + LOOP: for my $table (@tables) { + try { + local $^W = 0; # for ADO my $sth = $self->_sth_for($table, undef, \'1 = 0'); $sth->execute; - }; - if (not $@) { - push @filtered_tables, $table; } - else { - warn "Bad table or view '$table', ignoring: $@\n"; + catch { + warn "Bad table or view '$table', ignoring: $_\n"; $self->_unregister_source_for_table($table); - } + no warnings 'exiting'; + next LOOP; + }; + + push @filtered_tables, $table; } return @filtered_tables; @@ -193,9 +204,22 @@ sub _table_columns { sub _table_pk_info { my ($self, $table) = @_; + return [] if $self->_disable_pk_detection; + my $dbh = $self->schema->storage->dbh; - my @primary = map { $self->_lc($_) } $dbh->primary_key('', $self->db_schema, $table); + my @primary = try { + $dbh->primary_key('', $self->db_schema, $table); + } + catch { + warn "Cannot find primary keys for this driver: $_"; + $self->_disable_pk_detection(1); + return (); + }; + + return [] if not @primary; + + @primary = map { $self->_lc($_) } @primary; s/\Q$self->{_quoter}\E//g for @primary; return \@primary; @@ -205,9 +229,13 @@ sub _table_pk_info { sub _table_uniq_info { my ($self, $table) = @_; + return [] if $self->_disable_uniq_detection; + my $dbh = $self->schema->storage->dbh; - if(!$dbh->can('statistics_info')) { - warn "No UNIQUE constraint information can be gathered for this vendor"; + + if (not $dbh->can('statistics_info')) { + warn "No UNIQUE constraint information can be gathered for this driver"; + $self->_disable_uniq_detection(1); return []; } @@ -222,17 +250,14 @@ sub _table_uniq_info { || !defined $row->{ORDINAL_POSITION} || !$row->{COLUMN_NAME}; - $indices{$row->{INDEX_NAME}}->{$row->{ORDINAL_POSITION}} = $row->{COLUMN_NAME}; + $indices{$row->{INDEX_NAME}}[$row->{ORDINAL_POSITION}] = $self->_lc($row->{COLUMN_NAME}); } $sth->finish; my @retval; foreach my $index_name (keys %indices) { my $index = $indices{$index_name}; - push(@retval, [ $index_name => [ - map { $index->{$_} } - sort keys %$index - ]]); + push(@retval, [ $index_name => [ @$index[1..$#$index] ] ]); } return \@retval; @@ -242,9 +267,19 @@ sub _table_uniq_info { sub _table_fk_info { my ($self, $table) = @_; + return [] if $self->_disable_fk_detection; + my $dbh = $self->schema->storage->dbh; - my $sth = $dbh->foreign_key_info( '', $self->db_schema, '', - '', $self->db_schema, $table ); + my $sth = try { + $dbh->foreign_key_info( '', $self->db_schema, '', + '', $self->db_schema, $table ); + } + catch { + warn "Cannot introspect relationships for this driver: $_"; + $self->_disable_fk_detection(1); + return undef; + }; + return [] if !$sth; my %rels; @@ -282,53 +317,50 @@ sub _columns_info_for { my $dbh = $self->schema->storage->dbh; + my %result; + if ($dbh->can('column_info')) { - my %result; - eval { - 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}; - - my $size = $info->{COLUMN_SIZE}; - - if (defined $size && defined $info->{DECIMAL_DIGITS}) { - $column_info->{size} = [$size, $info->{DECIMAL_DIGITS}]; - } - elsif (defined $size) { - $column_info->{size} = $size; - } - - $column_info->{is_nullable} = $info->{NULLABLE} ? 1 : 0; - $column_info->{default_value} = $info->{COLUMN_DEF} if defined $info->{COLUMN_DEF}; - my $col_name = $info->{COLUMN_NAME}; - $col_name =~ s/^\"(.*)\"$/$1/; - - my $extra_info = $self->_extra_column_info( - $table, $col_name, $column_info, $info - ) || {}; - $column_info = { %$column_info, %$extra_info }; - - $result{$col_name} = $column_info; + my $sth = $self->_dbh_column_info($dbh, undef, $self->db_schema, $table, '%' ); + while ( my $info = $sth->fetchrow_hashref() ){ + my $column_info = {}; + $column_info->{data_type} = lc $info->{TYPE_NAME}; + + my $size = $info->{COLUMN_SIZE}; + + if (defined $size && defined $info->{DECIMAL_DIGITS}) { + $column_info->{size} = [$size, $info->{DECIMAL_DIGITS}]; } - $sth->finish; - }; + elsif (defined $size) { + $column_info->{size} = $size; + } + + $column_info->{is_nullable} = $info->{NULLABLE} ? 1 : 0; + $column_info->{default_value} = $info->{COLUMN_DEF} if defined $info->{COLUMN_DEF}; + my $col_name = $info->{COLUMN_NAME}; + $col_name =~ s/^\"(.*)\"$/$1/; + + $col_name = $self->_lc($col_name); + + my $extra_info = $self->_extra_column_info( + $table, $col_name, $column_info, $info + ) || {}; + $column_info = { %$column_info, %$extra_info }; + + $result{$col_name} = $column_info; + } + $sth->finish; - return \%result if !$@ && scalar keys %result; + return \%result if %result; } - my %result; my $sth = $self->_sth_for($table, undef, \'1 = 0'); $sth->execute; - my @columns = @{ $self->preserve_case ? $sth->{NAME} : $sth->{NAME_lc} }; - for my $i ( 0 .. $#columns ){ + + my @columns = @{ $sth->{NAME} }; + + for my $i (0 .. $#columns) { my $column_info = {}; - $column_info->{data_type} = lc $sth->{TYPE}->[$i]; + $column_info->{data_type} = lc $sth->{TYPE}[$i]; my $size = $sth->{PRECISION}[$i]; @@ -339,7 +371,7 @@ sub _columns_info_for { $column_info->{size} = $size; } - $column_info->{is_nullable} = $sth->{NULLABLE}->[$i] ? 1 : 0; + $column_info->{is_nullable} = $sth->{NULLABLE}[$i] ? 1 : 0; if ($column_info->{data_type} =~ m/^(.*?)\((.*?)\)$/) { $column_info->{data_type} = $1; @@ -349,7 +381,7 @@ sub _columns_info_for { my $extra_info = $self->_extra_column_info($table, $columns[$i], $column_info) || {}; $column_info = { %$column_info, %$extra_info }; - $result{$columns[$i]} = $column_info; + $result{ $self->_lc($columns[$i]) } = $column_info; } $sth->finish; @@ -357,7 +389,7 @@ sub _columns_info_for { my $colinfo = $result{$col}; my $type_num = $colinfo->{data_type}; my $type_name; - if(defined $type_num && $type_num =~ /^\d+\z/ && $dbh->can('type_info')) { + if (defined $type_num && $type_num =~ /^-?\d+\z/ && $dbh->can('type_info')) { my $type_info = $dbh->type_info($type_num); $type_name = $type_info->{TYPE_NAME} if $type_info; $colinfo->{data_type} = lc $type_name if $type_name; @@ -367,10 +399,33 @@ sub _columns_info_for { return \%result; } -# Override this in vendor class to return any additional column -# attributes +# do not use this, override _columns_info_for instead sub _extra_column_info {} +# override to mask warnings if needed (see mysql) +sub _dbh_column_info { + my ($self, $dbh) = (shift, shift); + + return $dbh->column_info(@_); +} + +# If a coderef uses DBI->connect, this should get its connect info. +sub _try_infer_connect_info_from_coderef { + my ($self, $code) = @_; + + my ($dsn, $user, $pass, $params); + + no warnings 'redefine'; + + local *DBI::connect = sub { + (undef, $dsn, $user, $pass, $params) = @_; + }; + + $code->(); + + return ($dsn, $user, $pass, $params); +} + =head1 SEE ALSO L