X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder%2FCompat%2Fv0_040.pm;h=547e750f4d2b868773d1e99287fa05480c2c2955;hb=306bf770bf08b06f92863808b1938f2fc704acb0;hp=d6333590892d8e460ff134cd81cb9d45b4698c78;hpb=2f01b5e3e1ba77316270cb2d7feac4330fd2ff7e;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm index d633359..547e750 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm @@ -5,7 +5,7 @@ use warnings; use base 'DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_05'; use mro 'c3'; -our $VERSION = '0.07036_04'; +our $VERSION = '0.07047'; sub _relnames_and_method { my ( $self, $local_moniker, $rel, $cond, $uniqs, $counters ) = @_; @@ -17,20 +17,20 @@ sub _relnames_and_method { my $local_cols = $rel->{local_columns}; # for single-column case, set the remote relname to just the column name - my ($remote_relname) = + my ($local_relname) = scalar keys %{$cond} == 1 ? $self->_inflect_singular( values %$cond ) : $self->_inflect_singular( lc $remote_table ); # If more than one rel between this pair of tables, use the local # col names to distinguish - my $local_relname; + my $remote_relname; if ($counters->{$remote_moniker} > 1) { my $colnames = '_' . join( '_', @$local_cols ); - $remote_relname .= $colnames if keys %$cond > 1; - ($local_relname) = $self->_inflect_plural( lc($local_table) . $colnames ); + $local_relname .= $colnames if keys %$cond > 1; + ($remote_relname) = $self->_inflect_plural( lc($local_table) . $colnames ); } else { - ($local_relname) = $self->_inflect_plural(lc $local_table); + ($remote_relname) = $self->_inflect_plural(lc $local_table); } return ( $local_relname, $remote_relname, 'has_many' ); @@ -48,9 +48,9 @@ compatibility with DBIx::Class::Schema::Loader version 0.04006 See L and L. -=head1 AUTHOR +=head1 AUTHORS -See L and L. +See L. =head1 LICENSE