X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=dce5f272a993a70b714f70a23a8f64320837c054;hb=refs%2Fheads%2Fregex_capture_issues;hp=7e9a7a7a9a517bb4e4c37e222d46777e9ade648f;hpb=0c1d5b472c4a25217e297e07c4392932061554fb;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 7e9a7a7..dce5f27 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI.pm @@ -3,10 +3,19 @@ package DBIx::Class::Schema::Loader::DBI; use strict; use warnings; use base qw/DBIx::Class::Schema::Loader::Base/; -use Class::C3; +use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; +use Try::Tiny; +use namespace::clean; -our $VERSION = '0.07000'; +our $VERSION = '0.07010'; + +__PACKAGE__->mk_group_accessors('simple', qw/ + _disable_pk_detection + _disable_uniq_detection + _disable_fk_detection + _passwords +/); =head1 NAME @@ -92,14 +101,14 @@ sub _tables_list { my ($table, $type) = @_ ? @_ : ('%', '%'); my $dbh = $self->schema->storage->dbh; - my @tables = $dbh->tables(undef, $self->db_schema, $table, $type); + my @tables = $dbh->tables(undef, $table->schema, $table, $type); my $qt = qr/[\Q$self->{_quoter}\E"'`\[\]]/; my $all_tables_quoted = (grep /$qt/, @tables) == @tables; if ($self->{_quoter} && $all_tables_quoted) { - s/.* $qt (?= .* $qt)//xg for @tables; + s/.* $qt (?= .* $qt\z)//xg for @tables; } else { s/^.*\Q$self->{_namesep}\E// for @tables; } @@ -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; @@ -156,14 +167,17 @@ sub load { sub _table_as_sql { my ($self, $table) = @_; - if($self->{db_schema}) { - $table = $self->{db_schema} . $self->{_namesep} . - $self->_quote_table_name($table); - } else { - $table = $self->_quote_table_name($table); + my $sql_maker = $self->schema->storage->sql_maker; + my $name_sep = $sql_maker->name_sep; + my $schema = $table->schema; + + if ($schema) { + return $self->_quote($schema) + . $name_sep + . $self->_quote($table); } - return $table; + return $self->_quote($table); } sub _sth_for { @@ -193,9 +207,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('', $table->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,14 +232,18 @@ 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 []; } my %indices; - my $sth = $dbh->statistics_info(undef, $self->db_schema, $table, 1, 1); + my $sth = $dbh->statistics_info(undef, $table->schema, $table, 1, 1); while(my $row = $sth->fetchrow_hashref) { # skip table-level stats, conditional indexes, and any index missing # critical fields @@ -222,17 +253,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 +270,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( '', $table->schema, '', + '', $table->schema, $table ); + } + catch { + warn "Cannot introspect relationships for this driver: $_"; + $self->_disable_fk_detection(1); + return undef; + }; + return [] if !$sth; my %rels; @@ -252,15 +290,15 @@ sub _table_fk_info { my $i = 1; # for unnamed rels, which hopefully have only 1 column ... while(my $raw_rel = $sth->fetchrow_arrayref) { my $uk_tbl = $raw_rel->[2]; - my $uk_col = lc $raw_rel->[3]; - my $fk_col = lc $raw_rel->[7]; + my $uk_col = $self->_lc($raw_rel->[3]); + my $fk_col = $self->_lc($raw_rel->[7]); my $relid = ($raw_rel->[11] || ( "__dcsld__" . $i++ )); $uk_tbl =~ s/\Q$self->{_quoter}\E//g; $uk_col =~ s/\Q$self->{_quoter}\E//g; $fk_col =~ s/\Q$self->{_quoter}\E//g; $relid =~ s/\Q$self->{_quoter}\E//g; $rels{$relid}->{tbl} = $uk_tbl; - $rels{$relid}->{cols}->{$uk_col} = $fk_col; + $rels{$relid}->{cols}{$uk_col} = $fk_col; } $sth->finish; @@ -282,47 +320,50 @@ sub _columns_info_for { my $dbh = $self->schema->storage->dbh; + my %result; + if ($dbh->can('column_info')) { - my %result; - eval { - my $sth = eval { 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, $table->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; - }; - return \%result if !$@ && scalar keys %result; + 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 %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]; @@ -333,17 +374,17 @@ 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; $column_info->{size} = $2; } - my $extra_info = $self->_extra_column_info($table, $columns[$i], $column_info) || {}; + my $extra_info = $self->_extra_column_info($table, $columns[$i], $column_info, $sth) || {}; $column_info = { %$column_info, %$extra_info }; - $result{$columns[$i]} = $column_info; + $result{ $self->_lc($columns[$i]) } = $column_info; } $sth->finish; @@ -351,9 +392,8 @@ 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')) { - my $type_info = $dbh->type_info($type_num); - $type_name = $type_info->{TYPE_NAME} if $type_info; + if (defined $type_num && $type_num =~ /^-?\d+\z/ && $dbh->can('type_info')) { + my $type_name = $self->_dbh_type_info_type_name($type_num); $colinfo->{data_type} = lc $type_name if $type_name; } } @@ -361,10 +401,44 @@ sub _columns_info_for { return \%result; } -# Override this in vendor class to return any additional column -# attributes +# Need to override this for the buggy Firebird ODBC driver. +sub _dbh_type_info_type_name { + my ($self, $type_num) = @_; + + my $dbh = $self->schema->storage->dbh; + + my $type_info = $dbh->type_info($type_num); + + return $type_info ? $type_info->{TYPE_NAME} : undef; +} + +# 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