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=13de355e8bb59d013821284fe8bccd0f5209e742;hpb=116431d67fe62da10229791aef6cc0d5a87802d9;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 13de355..f0cb406 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.07018'; +our $VERSION = '0.07048_01'; __PACKAGE__->mk_group_accessors('simple', qw/ _disable_pk_detection @@ -54,27 +54,28 @@ sub new { my $driver = $self->dbh->{Driver}->{Name}; my $subclass = 'DBIx::Class::Schema::Loader::DBI::' . $driver; - if ($self->load_optional_class($subclass)) { - bless $self, $subclass unless $self->isa($subclass); + if ((not $self->isa($subclass)) && $self->load_optional_class($subclass)) { + bless $self, $subclass; $self->_rebless; + Class::C3::reinitialize() if $] < 5.009005; } } - # Set up the default quoting character and name seperators + # Set up the default quoting character and name separators $self->quote_char($self->_build_quote_char); $self->name_sep($self->_build_name_sep); $self->_setup; - $self; + return $self; } 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 [ '<', '>' ]) @@ -88,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() @@ -107,19 +108,17 @@ 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 sub _supports_db_schema { 1 } # Returns an array of table objects -sub _tables_list { - my ($self, $opts) = (shift, shift); +sub _tables_list { + my ($self) = @_; my @tables; @@ -129,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/; @@ -150,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 @@ -190,22 +189,52 @@ sub _tables_list { } } - return $self->_filter_tables(\@tables, $opts); + return $self->_filter_tables(\@tables); +} + +sub _recurse_constraint { + my ($constraint, @parts) = @_; + + my $name = shift @parts; + + # If there are any parts left, the constraint must be an arrayref + croak "depth of constraint/exclude array does not match length of moniker_parts" + unless !!@parts == !!(ref $constraint eq 'ARRAY'); + + # if ths is the last part, use the constraint directly + return $name =~ $constraint unless @parts; + + # recurse into the first matching subconstraint + foreach (@{$constraint}) { + my ($re, $sub) = @{$_}; + return _recurse_constraint($sub, @parts) + if $name =~ $re; + } + return 0; +} + +sub _check_constraint { + my ($include, $constraint, @tables) = @_; + + return @tables unless defined $constraint; + + return grep { !$include xor _recurse_constraint($constraint, @{$_}) } @tables + if ref $constraint eq 'ARRAY'; + + return grep { !$include xor /$constraint/ } @tables; } + + # 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 ||= {}; - my $constraint = $opts->{constraint}; - my $exclude = $opts->{exclude}; - - @tables = grep { /$constraint/ } @tables if defined $constraint; - @tables = grep { ! /$exclude/ } @tables if defined $exclude; + @tables = _check_constraint(1, $self->constraint, @tables); + @tables = _check_constraint(0, $self->exclude, @tables); TABLE: for my $table (@tables) { try { @@ -238,15 +267,13 @@ sub load { local $self->dbh->{PrintError} = 0; $self->next::method(@_); - - $self->schema->storage->disconnect unless $self->dynamic; } sub _sth_for { my ($self, $table, $fields, $where) = @_; my $sth = $self->dbh->prepare($self->schema->storage->sql_maker - ->select(\$table->sql_name, $fields, $where)); + ->select(\$table->sql_name, $fields || \'*', $where)); return $sth; } @@ -266,7 +293,7 @@ sub _table_columns { } # Returns arrayref of pk col names -sub _table_pk_info { +sub _table_pk_info { my ($self, $table) = @_; return [] if $self->_disable_pk_detection; @@ -308,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; @@ -340,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; @@ -396,6 +423,14 @@ sub _table_fk_info { my %rels; + my @rules = ( + 'CASCADE', + 'RESTRICT', + 'SET NULL', + 'NO ACTION', + 'SET DEFAULT', + ); + my $i = 1; # for unnamed rels, which hopefully have only 1 column ... REL: while(my $raw_rel = $sth->fetchrow_arrayref) { my $uk_scm = $raw_rel->[1]; @@ -403,8 +438,20 @@ sub _table_fk_info { my $uk_col = $self->_lc($raw_rel->[3]); my $fk_scm = $raw_rel->[5]; my $fk_col = $self->_lc($raw_rel->[7]); + my $key_seq = $raw_rel->[8] - 1; my $relid = ($raw_rel->[11] || ( "__dcsld__" . $i++ )); + my $update_rule = $raw_rel->[9]; + my $delete_rule = $raw_rel->[10]; + + $update_rule = $rules[$update_rule] if defined $update_rule; + $delete_rule = $rules[$delete_rule] if defined $delete_rule; + + my $is_deferrable = $raw_rel->[13]; + + ($is_deferrable = $is_deferrable == 7 ? 0 : 1) + if defined $is_deferrable; + foreach my $var ($uk_scm, $uk_tbl, $uk_col, $fk_scm, $fk_col, $relid) { $var =~ s/[\Q$self->{quote_char}\E]//g if defined $var; } @@ -415,7 +462,7 @@ sub _table_fk_info { next REL; } - $rels{$relid}{tbl} = DBIx::Class::Schema::Loader::Table->new( + $rels{$relid}{tbl} ||= DBIx::Class::Schema::Loader::Table->new( loader => $self, name => $uk_tbl, schema => $uk_scm, @@ -423,16 +470,29 @@ sub _table_fk_info { ignore_schema => 1 )), ); - $rels{$relid}{cols}{$uk_col} = $fk_col; + + $rels{$relid}{attrs}{on_delete} = $delete_rule if $delete_rule; + $rels{$relid}{attrs}{on_update} = $update_rule if $update_rule; + $rels{$relid}{attrs}{is_deferrable} = $is_deferrable if defined $is_deferrable; + + # Add this data IN ORDER + $rels{$relid}{rcols}[$key_seq] = $uk_col; + $rels{$relid}{lcols}[$key_seq] = $fk_col; } $sth->finish; my @rels; foreach my $relid (keys %rels) { push(@rels, { - remote_columns => [ keys %{$rels{$relid}->{cols}} ], - local_columns => [ values %{$rels{$relid}->{cols}} ], + remote_columns => [ grep defined, @{ $rels{$relid}{rcols} } ], + local_columns => [ grep defined, @{ $rels{$relid}{lcols} } ], remote_table => $rels{$relid}->{tbl}, + (exists $rels{$relid}{attrs} ? + (attrs => $rels{$relid}{attrs}) + : + () + ), + _constraint_name => $relid, }); } @@ -446,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 { +{} }) { @@ -473,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; @@ -484,7 +546,7 @@ sub _columns_info_for { my @columns = @{ $sth->{NAME} }; COL: for my $i (0 .. $#columns) { - next COL if %{ $result{ $self->_lc($columns[$i]) }||{} }; + next COL if %{ $result{ $columns[$i] }||{} }; my $column_info = {}; $column_info->{data_type} = lc $sth->{TYPE}[$i]; @@ -548,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. @@ -558,7 +620,7 @@ sub _dbh_type_info_type_name { # We wrap it in a try block for MSSQL+DBD::Sybase, which can have issues. # TODO investigate further my $type_info = try { $self->dbh->type_info($type_num) }; - + return $type_info ? $type_info->{TYPE_NAME} : undef; } @@ -567,9 +629,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) @@ -602,13 +678,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