X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FDBIx%2FClass.pm;h=bd3d3ba6b274bea8c60ccdebfdb7ba0b70f6235d;hb=c418c5cc5d3e8b3b456ea0daf7569f4ac3ef7cd4;hp=d1ca66e48932b7fced5743e3f30892ba88caf7c5;hpb=cae467a7ad0b464475c0320f48e83a16afcc334b;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/SQL/Translator/Parser/DBIx/Class.pm b/lib/SQL/Translator/Parser/DBIx/Class.pm index d1ca66e..bd3d3ba 100644 --- a/lib/SQL/Translator/Parser/DBIx/Class.pm +++ b/lib/SQL/Translator/Parser/DBIx/Class.pm @@ -14,8 +14,10 @@ $DEBUG = 0 unless defined $DEBUG; use Exporter; use SQL::Translator::Utils qw(debug normalize_name); -use Carp::Clan qw/^SQL::Translator|^DBIx::Class/; -use Scalar::Util (); +use Carp::Clan qw/^SQL::Translator|^DBIx::Class|^Try::Tiny/; +use Scalar::Util 'weaken'; +use Try::Tiny; +use namespace::clean; use base qw(Exporter); @@ -33,7 +35,7 @@ use base qw(Exporter); sub parse { # this is a hack to prevent schema leaks due to a retarded SQLT implementation # DO NOT REMOVE (until SQLT2 is out, the all of this will be rewritten anyway) - Scalar::Util::weaken ($_[1]); + weaken $_[1] if ref ($_[1]); my ($tr, $data) = @_; my $args = $tr->parser_args; @@ -43,8 +45,12 @@ sub parse { croak 'No DBIx::Class::Schema' unless ($dbicschema); if (!ref $dbicschema) { - eval "use $dbicschema;"; - croak "Can't load $dbicschema ($@)" if($@); + try { + eval "require $dbicschema;" + } + catch { + croak "Can't load $dbicschema ($_)"; + } } my $schema = $tr->schema; @@ -59,7 +65,7 @@ sub parse { $dbicschema->throw_exception ("'sources' parameter must be an array or hash ref") unless( $ref eq 'ARRAY' || ref eq 'HASH' ); - # limit monikers to those specified in + # limit monikers to those specified in my $sources; if ($ref eq 'ARRAY') { $sources->{$_} = 1 for (@$limit_sources); @@ -165,7 +171,7 @@ sub parse { # Force the order of @cond to match the order of ->add_columns my $idx; my %other_columns_idx = map {'foreign.'.$_ => ++$idx } $relsource->columns; - my @cond = sort { $other_columns_idx{$a} cmp $other_columns_idx{$b} } keys(%{$rel_info->{cond}}); + my @cond = sort { $other_columns_idx{$a} cmp $other_columns_idx{$b} } keys(%{$rel_info->{cond}}); # Get the key information, mapping off the foreign/self markers my @refkeys = map {/^\w+\.(\w+)$/} @cond; @@ -209,11 +215,11 @@ sub parse { if($rel_table) { # Constraints are added only if applicable next unless $fk_constraint; - + # Make sure we dont create the same foreign key constraint twice my $key_test = join("\x00", sort @keys); next if $created_FK_rels{$rel_table}->{$key_test}; - + if (scalar(@keys)) { $created_FK_rels{$rel_table}->{$key_test} = 1; @@ -238,16 +244,14 @@ sub parse { # global parser_args add_fk_index param can be overridden on the rel def my $add_fk_index_rel = (exists $rel_info->{attrs}{add_fk_index}) ? $rel_info->{attrs}{add_fk_index} : $add_fk_index; - # Make sure we don't create another index with the same - # order of columns twice - # WARNING: don't sort the key columns because the order of + # Check that we do not create an index identical to the PK index + # (some RDBMS croak on this, and it generally doesn't make much sense) + # NOTE: we do not sort the key columns because the order of # columns is important for indexes and two indexes with the # same cols but different order are allowed and sometimes # needed - my $key_idx_test = join("\x00", @keys); - my $pk_idx_test = join("\x00", @primary); - next if $key_idx_test eq $pk_idx_test; + next if join("\x00", @keys) eq join("\x00", @primary); if ($add_fk_index_rel) { my $index = $table->add_index( @@ -266,6 +270,7 @@ sub parse { my $dependencies = { map { $_ => _resolve_deps ($_, \%tables) } (keys %tables) }; + for my $table (sort { keys %{$dependencies->{$a} || {} } <=> keys %{ $dependencies->{$b} || {} } @@ -294,9 +299,25 @@ EOW } my %views; - foreach my $moniker (sort keys %view_monikers) + my @views = map { $dbicschema->source($_) } keys %view_monikers; + + my $view_dependencies = { + map { + $_ => _resolve_view_deps( $dbicschema->source($_), \%view_monikers ) + } ( keys %view_monikers ) + }; + + my @view_sources = + sort { + keys %{ $view_dependencies->{ $a->source_name } || {} } <=> + keys %{ $view_dependencies->{ $b->source_name } || {} } + || $a->source_name cmp $b->source_name + } + map { $dbicschema->source($_) } + keys %view_monikers; + + foreach my $source (@view_sources) { - my $source = $dbicschema->source($moniker); my $view_name = $source->name; # FIXME - this isn't the right way to do it, but sqlt does not @@ -364,6 +385,32 @@ sub _resolve_deps { return $ret; } +sub _resolve_view_deps { + my ( $view, $monikers, $seen ) = @_; + + my $ret = {}; + $seen ||= {}; + + # copy and bump all deps by one (so we can reconstruct the chain) + my %seen = map { $_ => $seen->{$_} + 1 } ( keys %$seen ); + $seen{ $view->source_name } = 1; + for my $dep ( keys %{ $view->{deploy_depends_on} } ) { + if ( $seen->{$dep} ) { + return {}; + } + my ($new_source_name) = + grep { $view->schema->source($_)->name eq $dep } + @{ [ $view->schema->sources ] }; + my $subdeps = + _resolve_view_deps( $view->schema->source($new_source_name), + $monikers, \%seen, ); + $ret->{$_} += $subdeps->{$_} for ( keys %$subdeps ); + + ++$ret->{$dep}; + } + return $ret; +} + 1; =head1 NAME @@ -421,17 +468,18 @@ L. =head2 add_fk_index Create an index for each foreign key. -It defaults to enabled because this is a sensible default which accelerates most rdbms. +Enabled by default, as having indexed foreign key columns is normally the +sensible thing to do. =head2 sources =over 4 -=item Arguments: @classes +=item Arguments: \@class_names =back - -To explicitly specify which ResultSources should be parsed. + +Limit the amount of parsed sources by supplying an explicit list of source names. =head1 SEE ALSO @@ -439,10 +487,10 @@ L, L =head1 AUTHORS -Jess Robinson +See L. -Matt S Trout +=head1 LICENSE -Ash Berlin +You may distribute this code under the same terms as Perl itself. -Alexander Hartmaier +=cut