X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=582c1ae634802aecb8a4b4cd0662692a07b30c4d;hb=dc783fab900d073db1fb0e86b709cbb65bd364b7;hp=f2bbc14f37381d5675ff4ff328a4806e2fb40efb;hpb=b187901e0210a67eb8c62404316df5136dd71e14;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 f2bbc14..582c1ae 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI.pm @@ -5,12 +5,12 @@ use warnings; use base qw/DBIx::Class::Schema::Loader::Base/; use mro 'c3'; use Try::Tiny; -use List::MoreUtils 'any'; +use List::Util 'any'; use Carp::Clan qw/^DBIx::Class/; use namespace::clean; use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07036'; +our $VERSION = '0.07045'; __PACKAGE__->mk_group_accessors('simple', qw/ _disable_pk_detection @@ -74,8 +74,8 @@ sub _build_quote_char { my $self = shift; my $quote_char = $self->dbh->get_info(29) - || $self->schema->storage->sql_maker->quote_char - || q{"}; + || $self->schema->storage->sql_maker->quote_char + || q{"}; # For our usage as regex matches, concatenating multiple quote_char # values works fine (e.g. s/[\Q<>\E]// if quote_char was [ '<', '>' ]) @@ -89,8 +89,8 @@ sub _build_quote_char { sub _build_name_sep { my $self = shift; return $self->dbh->get_info(41) - || $self->schema->storage->sql_maker->name_sep - || '.'; + || $self->schema->storage->sql_maker->name_sep + || '.'; } # Override this in vendor modules to do things at the end of ->new() @@ -108,11 +108,9 @@ sub _system_tables { } sub _dbh_tables { - my ($self, $schema) = (shift, shift); - - my ($table_pattern, $table_type_pattern) = @_ ? @_ : ('%', '%'); + my $self = shift; - return $self->dbh->tables(undef, $schema, $table_pattern, $table_type_pattern); + return $self->dbh->tables(undef, @_); } # default to be overridden in subclasses if necessary @@ -120,7 +118,7 @@ sub _supports_db_schema { 1 } # Returns an array of table objects sub _tables_list { - my ($self, $opts) = (shift, shift); + my ($self) = @_; my @tables; @@ -130,7 +128,7 @@ sub _tables_list { my $nns = qr/[^\Q$self->{name_sep}\E]/; foreach my $schema (@{ $self->db_schema || [undef] }) { - my @raw_table_names = $self->_dbh_tables($schema, @_); + my @raw_table_names = $self->_dbh_tables($schema); TABLE: foreach my $raw_table_name (@raw_table_names) { my $quoted = $raw_table_name =~ /^$qt/; @@ -151,7 +149,7 @@ sub _tables_list { if (ref $system_schema) { $matches = 1 if $schema_name =~ $system_schema - && $schema !~ $system_schema; + && $schema !~ $system_schema; } else { $matches = 1 @@ -191,7 +189,7 @@ sub _tables_list { } } - return $self->_filter_tables(\@tables, $opts); + return $self->_filter_tables(\@tables); } sub _recurse_constraint { @@ -230,14 +228,13 @@ sub _check_constraint { # apply constraint/exclude and ignore bad tables and views sub _filter_tables { - my ($self, $tables, $opts) = @_; + my ($self, $tables) = @_; my @tables = @$tables; my @filtered_tables; - $opts ||= {}; - @tables = _check_constraint(1, $opts->{constraint}, @tables); - @tables = _check_constraint(0, $opts->{exclude}, @tables); + @tables = _check_constraint(1, $self->constraint, @tables); + @tables = _check_constraint(0, $self->exclude, @tables); TABLE: for my $table (@tables) { try { @@ -270,8 +267,6 @@ sub load { local $self->dbh->{PrintError} = 0; $self->next::method(@_); - - $self->schema->storage->disconnect unless $self->dynamic; } sub _sth_for { @@ -340,17 +335,18 @@ sub _table_uniq_info { next if $row->{TYPE} eq 'table' || defined $row->{FILTER_CONDITION} || !$row->{INDEX_NAME} - || !defined $row->{ORDINAL_POSITION} - || !$row->{COLUMN_NAME}; + || !defined $row->{ORDINAL_POSITION}; - $indices{$row->{INDEX_NAME}}[$row->{ORDINAL_POSITION}] = $self->_lc($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 => [ @$index[1..$#$index] ] ]); + foreach my $index_name (sort keys %indices) { + my (undef, @cols) = @{$indices{$index_name}}; + # skip indexes with missing column names (e.g. expression indexes) + next unless @cols == grep $_, @cols; + push(@retval, [ $index_name => \@cols ]); } return \@retval; @@ -372,10 +368,9 @@ WHERE table_name = @{[ $dbh->quote($table->name) ]} EOF # Failback: try the REMARKS column on table_info - if (!$comment && $dbh->can('table_info')) { - my $sth = $self->_dbh_table_info( $dbh, undef, $table->schema, $table->name ); - my $info = $sth->fetchrow_hashref(); - $comment = $info->{REMARKS}; + if (!$comment) { + my $info = $self->_dbh_table_info( $dbh, $table ); + $comment = $info->{REMARKS} if $info; } return $comment; @@ -632,9 +627,23 @@ sub _extra_column_info {} # override to mask warnings if needed sub _dbh_table_info { - my ($self, $dbh) = (shift, shift); + my ($self, $dbh, $table) = (shift, shift, shift); + + return undef if !$dbh->can('table_info'); + my $sth = $dbh->table_info(undef, $table->schema, $table->name); + while (my $info = $sth->fetchrow_hashref) { + next if !$self->_table_info_matches($table, $info); + return $info; + } + return undef; +} + +sub _table_info_matches { + my ($self, $table, $info) = @_; - return $dbh->table_info(@_); + no warnings 'uninitialized'; + return $info->{TABLE_SCHEM} eq $table->schema + && $info->{TABLE_NAME} eq $table->name; } # override to mask warnings if needed (see mysql) @@ -667,13 +676,21 @@ sub dbh { return $self->schema->storage->dbh; } +sub _table_is_view { + my ($self, $table) = @_; + + my $info = $self->_dbh_table_info($self->dbh, $table) + or return 0; + return $info->{TABLE_TYPE} eq 'VIEW'; +} + =head1 SEE ALSO L -=head1 AUTHOR +=head1 AUTHORS -See L and L. +See L. =head1 LICENSE