X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=08acde0f1ac845968ccae730266e3eab5297e63a;hb=dc783fab900d073db1fb0e86b709cbb65bd364b7;hp=6bcba6865c136fe57ece5bbae973e6230438f4bf;hpb=9b0436e27d8755a3173ef36668c7e910e3b7dbcf;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm index 6bcba68..08acde0 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm @@ -6,10 +6,9 @@ use base 'Class::Accessor::Grouped'; use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; use Scalar::Util 'weaken'; -use DBIx::Class::Schema::Loader::Utils qw/split_name slurp_file array_eq/; +use DBIx::Class::Schema::Loader::Utils qw/split_name slurp_file array_eq apply uniq/; use Try::Tiny; -use List::Util 'first'; -use List::MoreUtils qw/apply uniq any/; +use List::Util qw/all any first/; use namespace::clean; use Lingua::EN::Inflect::Phrase (); use Lingua::EN::Tagger (); @@ -18,7 +17,7 @@ use String::ToIdentifier::EN::Unicode (); use Class::Unload (); use Class::Inspector (); -our $VERSION = '0.07040'; +our $VERSION = '0.07045'; # Glossary: # @@ -95,16 +94,18 @@ This method will return the generated relationships as a hashref keyed on the class names. The values are arrayrefs of hashes containing method name and arguments, like so: - { - 'Some::Source::Class' => [ - { method => 'belongs_to', arguments => [ 'col1', 'Another::Source::Class' ], - { method => 'has_many', arguments => [ 'anothers', 'Yet::Another::Source::Class', 'col15' ], - ], - 'Another::Source::Class' => [ - # ... - ], - # ... - } + { + 'Some::Source::Class' => [ + { method => 'belongs_to', arguments => [ + 'col1', 'Another::Source::Class' ] }, + { method => 'has_many', arguments => [ + 'anothers', 'Yet::Another::Source::Class', 'col15' ] }, + ], + 'Another::Source::Class' => [ + # ... + ], + # ... + } =cut @@ -116,6 +117,7 @@ __PACKAGE__->mk_group_accessors('simple', qw/ relationship_attrs rel_collision_map rel_name_map + allow_extra_m2m_cols _temp_classes __tagger /); @@ -134,12 +136,11 @@ sub new { my $self = { loader => $loader, - schema => $loader->schema, - inflect_plural => $loader->inflect_plural, - inflect_singular => $loader->inflect_singular, - relationship_attrs => $loader->relationship_attrs, - rel_collision_map => $loader->rel_collision_map, - rel_name_map => $loader->rel_name_map, + (map { $_ => $loader->$_ } qw( + schema inflect_plural inflect_singular + relationship_attrs rel_collision_map + rel_name_map allow_extra_m2m_cols + )), _temp_classes => [], }; @@ -511,55 +512,47 @@ sub generate_code { sub _generate_m2ms { my ($self, $all_code) = @_; - foreach my $class (sort keys %$all_code) { - my $rels = $all_code->{$class}; - next unless (grep $_->{method} eq 'belongs_to', @$rels) == 2; + LINK_CLASS: + foreach my $link_class (sort keys %$all_code) { + my @rels = grep $_->{method} eq 'belongs_to', @{$all_code->{$link_class}}; + next unless @rels == 2; - my $class1_local_moniker = $rels->[0]{extra}{remote_moniker}; - my $class1_remote_moniker = $rels->[1]{extra}{remote_moniker}; + my @class; + foreach my $this (0, 1) { + my $that = $this ? 0 : 1; + my %class; + $class[$this] = \%class; + $class{local_moniker} = $rels[$this]{extra}{remote_moniker}; + $class{remote_moniker} = $rels[$that]{extra}{remote_moniker}; - my $class2_local_moniker = $rels->[1]{extra}{remote_moniker}; - my $class2_remote_moniker = $rels->[0]{extra}{remote_moniker}; + $class{class} = $rels[$this]{args}[1]; - my $class1 = $rels->[0]{args}[1]; - my $class2 = $rels->[1]{args}[1]; + my %link_cols = map { $_ => 1 } apply { s/^self\.//i } values %{ $rels[$this]{args}[2] }; - my $class1_to_link_table_rel = first { - $_->{method} eq 'has_many' && $_->{args}[1] eq $class - } @{ $all_code->{$class1} }; + $class{link_table_rel} = first { + $_->{method} eq 'has_many' + and + $_->{args}[1] eq $link_class + and + all { $link_cols{$_} } apply { s/^foreign\.//i } keys %{$_->{args}[2]} + } @{ $all_code->{$class{class}} }; - next unless $class1_to_link_table_rel; + next LINK_CLASS unless $class{link_table_rel}; - my $class1_to_link_table_rel_name = $class1_to_link_table_rel->{args}[0]; + $class{link_table_rel_name} = $class{link_table_rel}{args}[0]; - my $class2_to_link_table_rel = first { - $_->{method} eq 'has_many' && $_->{args}[1] eq $class - } @{ $all_code->{$class2} }; + $class{link_rel} = $rels[$that]{args}[0]; - next unless $class2_to_link_table_rel; + $class{from_cols} = [ apply { s/^self\.//i } values %{ + $class{link_table_rel}->{args}[2] + } ]; - my $class2_to_link_table_rel_name = $class2_to_link_table_rel->{args}[0]; - - my $class1_link_rel = $rels->[1]{args}[0]; - my $class2_link_rel = $rels->[0]{args}[0]; - - my @class1_from_cols = apply { s/^self\.//i } values %{ - $class1_to_link_table_rel->{args}[2] - }; + $class{to_cols} = [ apply { s/^foreign\.//i } keys %{ $rels[$that]{args}[2] } ]; - my @class1_link_cols = apply { s/^self\.//i } values %{ $rels->[1]{args}[2] }; - - my @class1_to_cols = apply { s/^foreign\.//i } keys %{ $rels->[1]{args}[2] }; - - my @class2_from_cols = apply { s/^self\.//i } values %{ - $class2_to_link_table_rel->{args}[2] - }; - - my @class2_link_cols = apply { s/^self\.//i } values %{ $rels->[0]{args}[2] }; - - my @class2_to_cols = apply { s/^foreign\.//i } keys %{ $rels->[0]{args}[2] }; + $class{from_link_cols} = [ apply { s/^self\.//i } values %{ $rels[$this]{args}[2] } ]; + } - my $link_moniker = $rels->[0]{extra}{local_moniker}; + my $link_moniker = $rels[0]{extra}{local_moniker}; my @link_table_cols = @{[ $self->schema->source($link_moniker)->columns ]}; @@ -567,102 +560,57 @@ sub _generate_m2ms { my @link_table_primary_cols = @{[ $self->schema->source($link_moniker)->primary_columns ]}; - next unless @class1_link_cols + @class2_link_cols == @link_table_cols - && @link_table_cols == @link_table_primary_cols; - - my ($class1_to_class2_relname) = $self->_rel_name_map( - ($self->_inflect_plural($class1_link_rel))[0], - 'many_to_many', - $class1, - $class1_local_moniker, - \@class1_from_cols, - $class2, - $class1_remote_moniker, - \@class1_to_cols, - { - link_class => $class, - link_moniker => $link_moniker, - link_rel_name => $class1_to_link_table_rel_name, - }, - ); - - $class1_to_class2_relname = $self->_resolve_relname_collision( - $class1_local_moniker, - \@class1_from_cols, - $class1_to_class2_relname, - ); - - my ($class2_to_class1_relname) = $self->_rel_name_map( - ($self->_inflect_plural($class2_link_rel))[0], - 'many_to_many', - $class1, - $class2_local_moniker, - \@class2_from_cols, - $class2, - $class2_remote_moniker, - \@class2_to_cols, - { - link_class => $class, - link_moniker => $link_moniker, - link_rel_name => $class2_to_link_table_rel_name, - }, - ); - - $class2_to_class1_relname = $self->_resolve_relname_collision( - $class2_local_moniker, - \@class2_from_cols, - $class2_to_class1_relname, - ); - - push @{$all_code->{$class1}}, { - method => 'many_to_many', - args => [ - $class1_to_class2_relname, - $class1_to_link_table_rel_name, - $class1_link_rel, - $self->_relationship_attrs('many_to_many', {}, { - rel_type => 'many_to_many', - rel_name => $class1_to_class2_relname, - local_source => $self->schema->source($class1_local_moniker), - remote_source => $self->schema->source($class1_remote_moniker), - local_table => $self->loader->class_to_table->{$class1}, - local_cols => \@class1_from_cols, - remote_table => $self->loader->class_to_table->{$class2}, - remote_cols => \@class2_from_cols, - }) || (), - ], - extra => { - local_class => $class1, - link_class => $class, - local_moniker => $class1_local_moniker, - remote_moniker => $class1_remote_moniker, - }, - }; + next unless array_eq( + [ sort +uniq @{$class[0]{from_link_cols}}, @{$class[1]{from_link_cols}} ], + [ sort @link_table_primary_cols ], + ) && ($self->allow_extra_m2m_cols || @link_table_cols == @link_table_primary_cols); + + foreach my $this (0, 1) { + my $that = $this ? 0 : 1; + ($class[$this]{m2m_relname}) = $self->_rel_name_map( + ($self->_inflect_plural($class[$this]{link_rel}))[0], + 'many_to_many', + @{$class[$this]}{qw(class local_moniker from_cols)}, + $class[$that]{class}, + @{$class[$this]}{qw(remote_moniker to_cols)}, + { + link_class => $link_class, + link_moniker => $link_moniker, + link_rel_name => $class[$this]{link_table_rel_name}, + }, + ); - push @{$all_code->{$class2}}, { - method => 'many_to_many', - args => [ - $class2_to_class1_relname, - $class2_to_link_table_rel_name, - $class2_link_rel, - $self->_relationship_attrs('many_to_many', {}, { - rel_type => 'many_to_many', - rel_name => $class2_to_class1_relname, - local_source => $self->schema->source($class2_local_moniker), - remote_source => $self->schema->source($class2_remote_moniker), - local_table => $self->loader->class_to_table->{$class2}, - local_cols => \@class2_from_cols, - remote_table => $self->loader->class_to_table->{$class1}, - remote_cols => \@class1_from_cols, - }) || (), - ], - extra => { - local_class => $class2, - link_class => $class, - local_moniker => $class2_local_moniker, - remote_moniker => $class2_remote_moniker, - }, - }; + $class[$this]{m2m_relname} = $self->_resolve_relname_collision( + @{$class[$this]}{qw(local_moniker from_cols m2m_relname)}, + ); + } + + for my $this (0, 1) { + my $that = $this ? 0 : 1; + + push @{$all_code->{$class[$this]{class}}}, { + method => 'many_to_many', + args => [ + @{$class[$this]}{qw(m2m_relname link_table_rel_name link_rel)}, + $self->_relationship_attrs('many_to_many', {}, { + rel_type => 'many_to_many', + rel_name => $class[$this]{class2_relname}, + local_source => $self->schema->source($class[$this]{local_moniker}), + remote_source => $self->schema->source($class[$this]{remote_moniker}), + local_table => $self->loader->class_to_table->{$class[$this]{class}}, + local_cols => $class[$this]{from_cols}, + remote_table => $self->loader->class_to_table->{$class[$that]{class}}, + remote_cols => $class[$that]{from_cols}, + }) || (), + ], + extra => { + local_class => $class[$this]{class}, + link_class => $link_class, + local_moniker => $class[$this]{local_moniker}, + remote_moniker => $class[$this]{remote_moniker}, + }, + }; + } } } @@ -1021,9 +969,9 @@ sub _cleanup { $self->_temp_classes([]); } -=head1 AUTHOR +=head1 AUTHORS -See L and L. +See L. =head1 LICENSE