X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FDBIx%2FClass.pm;h=d4499aa7ac136fd5e6468ad97035e993f1ca4330;hb=555b3385868f4954e1faf0a01d4d691a07905250;hp=4610e203eeba4602990232adcdf4411a751012b7;hpb=a7e65bb51bb6dbdfdaf229a6d0dd1d8c25bef337;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/SQL/Translator/Parser/DBIx/Class.pm b/lib/SQL/Translator/Parser/DBIx/Class.pm index 4610e20..d4499aa 100644 --- a/lib/SQL/Translator/Parser/DBIx/Class.pm +++ b/lib/SQL/Translator/Parser/DBIx/Class.pm @@ -14,7 +14,6 @@ $DEBUG = 0 unless defined $DEBUG; use Exporter; use Data::Dumper; -use Digest::SHA1 qw( sha1_hex ); use SQL::Translator::Utils qw(debug normalize_name); use base qw(Exporter); @@ -24,6 +23,9 @@ use base qw(Exporter); # ------------------------------------------------------------------- # parse($tr, $data) # +# setting parser_args => { add_fk_index => 0 } will prevent +# the auto-generation of an index for each FK. +# # Note that $data, in the case of this parser, is not useful. # We're working with DBIx::Class Schemas, not data streams. # ------------------------------------------------------------------- @@ -67,6 +69,9 @@ sub parse { foreach my $moniker (sort @monikers) { my $source = $dbicschema->source($moniker); + + # Skip custom query sources + next if ref($source->name); # Its possible to have multiple DBIC source using same table next if $seen_tables{$source->name}++; @@ -110,6 +115,9 @@ sub parse { my @rels = $source->relationships(); my %created_FK_rels; + + # global add_fk_index set in parser_args + my $add_fk_index = (exists $args->{add_fk_index} && ($args->{add_fk_index} == 0)) ? 0 : 1; foreach my $rel (sort @rels) { @@ -121,45 +129,66 @@ sub parse { my $othertable = $source->related_source($rel); my $rel_table = $othertable->name; + my $reverse_rels = $source->reverse_relationship_info($rel); + my ($otherrelname, $otherrelationship) = each %{$reverse_rels}; + + # Force the order of @cond to match the order of ->add_columns + my $idx; + my %other_columns_idx = map {'foreign.'.$_ => ++$idx } $othertable->columns; + 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 @cond = keys(%{$rel_info->{cond}}); my @refkeys = map {/^\w+\.(\w+)$/} @cond; my @keys = map {$rel_info->{cond}->{$_} =~ /^\w+\.(\w+)$/} @cond; - if($rel_table) - { - my $reverse_rels = $source->reverse_relationship_info($rel); - my ($otherrelname, $otherrelationship) = each %{$reverse_rels}; + # determine if this relationship is a self.fk => foreign.pk (i.e. belongs_to) + my $fk_constraint; - my $on_delete = ''; - my $on_update = ''; + #first it can be specified explicitly + if ( exists $rel_info->{attrs}{is_foreign_key_constraint} ) { + $fk_constraint = $rel_info->{attrs}{is_foreign_key_constraint}; + } + # it can not be multi + elsif ( $rel_info->{attrs}{accessor} eq 'multi' ) { + $fk_constraint = 0; + } + # if indeed single, check if all self.columns are our primary keys. + # this is supposed to indicate a has_one/might_have... + # where's the introspection!!?? :) + else { + $fk_constraint = not $source->compare_relationship_keys(\@keys, \@primary); + } - if (defined $otherrelationship) { - $on_delete = $otherrelationship->{'attrs'}->{cascade_delete} ? 'CASCADE' : ''; - $on_update = $otherrelationship->{'attrs'}->{cascade_copy} ? 'CASCADE' : ''; + my $cascade; + for my $c (qw/delete update/) { + if (exists $rel_info->{attrs}{"on_$c"}) { + if ($fk_constraint) { + $cascade->{$c} = $rel_info->{attrs}{"on_$c"}; + } + else { + warn "SQLT attribute 'on_$c' was supplied for relationship '$moniker/$rel', which does not appear to be a foreign constraint. " + . "If you are sure that SQLT must generate a constraint for this relationship, add 'is_foreign_key_constraint => 1' to the attributes.\n"; + } } + elsif (defined $otherrelationship and $otherrelationship->{attrs}{$c eq 'update' ? 'cascade_copy' : 'cascade_delete'}) { + $cascade->{$c} = 'CASCADE'; + } + } - my $is_deferrable = $rel_info->{attrs}{is_deferrable}; + 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", @keys); + next if $created_FK_rels{$rel_table}->{$key_test}; + + my $is_deferrable = $rel_info->{attrs}{is_deferrable}; + + # 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; - #Decide if this is a foreign key based on whether the self - #items are our primary columns. - - # If the sets are different, then we assume it's a foreign key from - # us to another table. - # OR: If is_foreign_key_constraint attr is explicity set (or set to false) on the relation - next if ( exists $created_FK_rels{$rel_table}->{$key_test} ); - if ( exists $rel_info->{attrs}{is_foreign_key_constraint}) { - # not is this attr set to 0 but definitely if set to 1 - next unless ($rel_info->{attrs}{is_foreign_key_constraint}); - } else { - # not if might have - # next if ($rel_info->{attrs}{accessor} eq 'single' && exists $rel_info->{attrs}{join_type} && uc($rel_info->{attrs}{join_type}) eq 'LEFT'); - # not sure about this one - next if $source->compare_relationship_keys(\@keys, \@primary); - } $created_FK_rels{$rel_table}->{$key_test} = 1; if (scalar(@keys)) { @@ -169,20 +198,22 @@ sub parse { fields => \@keys, reference_fields => \@refkeys, reference_table => $rel_table, - on_delete => $on_delete, - on_update => $on_update, + on_delete => uc ($cascade->{delete} || ''), + on_update => uc ($cascade->{update} || ''), (defined $is_deferrable ? ( deferrable => $is_deferrable ) : ()), ); - my $index = $table->add_index( - name => join('_', $table->name, 'idx', @keys), - fields => \@keys, - type => 'NORMAL', - ); - } + if ($add_fk_index_rel) { + my $index = $table->add_index( + name => join('_', $table->name, 'idx', @keys), + fields => \@keys, + type => 'NORMAL', + ); + } + } } } - + if ($source->result_class->can('sqlt_deploy_hook')) { $source->result_class->sqlt_deploy_hook($table); }