X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FDBIx%2FClass.pm;h=9335509469506dd7087e222f3df9331b7a3b8ec7;hb=70c49125fbb6ace2022621dc429f2815407940d9;hp=edf6224ae6bd662030212df8f1247a97391587a0;hpb=5bdf1b3d32c377ae24933000d198aa27366ca584;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/SQL/Translator/Parser/DBIx/Class.pm b/lib/SQL/Translator/Parser/DBIx/Class.pm index edf6224..9335509 100644 --- a/lib/SQL/Translator/Parser/DBIx/Class.pm +++ b/lib/SQL/Translator/Parser/DBIx/Class.pm @@ -5,11 +5,12 @@ package # hide from PAUSE # Some mistakes the fault of Matt S Trout +# Others the fault of Ash Berlin + use strict; use warnings; -use vars qw($DEBUG $VERSION @EXPORT_OK); +use vars qw($DEBUG @EXPORT_OK); $DEBUG = 0 unless defined $DEBUG; -$VERSION = sprintf "%d.%02d", q$Revision 1.0$ =~ /(\d+)\.(\d+)/; use Exporter; use Data::Dumper; @@ -22,32 +23,34 @@ 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. # ------------------------------------------------------------------- sub parse { my ($tr, $data) = @_; my $args = $tr->parser_args; - my $dbixschema = $args->{'DBIx::Schema'} || $data; - $dbixschema ||= $args->{'package'}; + my $dbicschema = $args->{'DBIx::Class::Schema'} || $args->{"DBIx::Schema"} ||$data; + $dbicschema ||= $args->{'package'}; my $limit_sources = $args->{'sources'}; - die 'No DBIx::Schema' unless ($dbixschema); - if (!ref $dbixschema) { - eval "use $dbixschema;"; - die "Can't load $dbixschema ($@)" if($@); + die 'No DBIx::Class::Schema' unless ($dbicschema); + if (!ref $dbicschema) { + eval "use $dbicschema;"; + die "Can't load $dbicschema ($@)" if($@); } my $schema = $tr->schema; my $table_no = 0; -# print Dumper($dbixschema->registered_classes); - - #foreach my $tableclass ($dbixschema->registered_classes) + $schema->name( ref($dbicschema) . " v" . ($dbicschema->VERSION || '1.x')) + unless ($schema->name); my %seen_tables; - my @monikers = $dbixschema->sources; + my @monikers = sort $dbicschema->sources; if ($limit_sources) { my $ref = ref $limit_sources || ''; die "'sources' parameter must be an array or hash ref" unless $ref eq 'ARRAY' || ref eq 'HASH'; @@ -63,12 +66,11 @@ sub parse { } - foreach my $moniker (@monikers) + foreach my $moniker (sort @monikers) { - #eval "use $tableclass"; - #print("Can't load $tableclass"), next if($@); - my $source = $dbixschema->source($moniker); + my $source = $dbicschema->source($moniker); + # Its possible to have multiple DBIC source using same table next if $seen_tables{$source->name}++; my $table = $schema->add_table( @@ -78,7 +80,7 @@ sub parse { my $colcount = 0; foreach my $col ($source->columns) { - # assuming column_info in dbix is the same as DBI (?) + # assuming column_info in dbic is the same as DBI (?) # data_type is a number, column_type is text? my %colinfo = ( name => $col, @@ -97,11 +99,11 @@ sub parse { my @primary = $source->primary_columns; my %unique_constraints = $source->unique_constraints; - foreach my $uniq (keys %unique_constraints) { + foreach my $uniq (sort keys %unique_constraints) { if (!$source->compare_relationship_keys($unique_constraints{$uniq}, \@primary)) { $table->add_constraint( type => 'unique', - name => "$uniq", + name => $uniq, fields => $unique_constraints{$uniq} ); } @@ -110,8 +112,11 @@ 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 (@rels) + foreach my $rel (sort @rels) { my $rel_info = $source->relationship_info($rel); @@ -121,14 +126,17 @@ sub parse { my $othertable = $source->related_source($rel); my $rel_table = $othertable->name; + # 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}; @@ -140,6 +148,11 @@ sub parse { $on_update = $otherrelationship->{'attrs'}->{cascade_copy} ? 'CASCADE' : ''; } + 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; + # Make sure we dont create the same foreign key constraint twice my $key_test = join("\x00", @keys); @@ -148,29 +161,52 @@ sub parse { # If the sets are different, then we assume it's a foreign key from # us to another table. - # OR: If is_foreign_key attr is explicity set on one the local columns - if ( ! exists $created_FK_rels{$rel_table}->{$key_test} - && - ( !$source->compare_relationship_keys(\@keys, \@primary) || - grep { $source->column_info($_)->{is_foreign_key} } @keys - ) - ) { - $created_FK_rels{$rel_table}->{$key_test} = 1; - $table->add_constraint( - type => 'foreign_key', - name => "fk_$keys[0]", - fields => \@keys, - reference_fields => \@refkeys, - reference_table => $rel_table, - on_delete => $on_delete, - on_update => $on_update - ); + # 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)) { + $table->add_constraint( + type => 'foreign_key', + name => join('_', $table->name, 'fk', @keys), + fields => \@keys, + reference_fields => \@refkeys, + reference_table => $rel_table, + on_delete => $on_delete, + on_update => $on_update, + (defined $is_deferrable ? ( deferrable => $is_deferrable ) : ()), + ); + + 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); + } + } + + if ($dbicschema->can('sqlt_deploy_hook')) { + $dbicschema->sqlt_deploy_hook($schema); } + return 1; } 1; -