X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=d9f8740b4781a152c4c4f28c909bc3717bf3b161;hb=7507c8ce0703993b79b31bf90144e28ef97d4a9d;hp=35a50a837438f8c36e255ba50e5c2379975245bd;hpb=b97c2c1e790cc4c18370238fd98eddac4e7de2d8;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 35a50a8..d9f8740 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp::Clan qw/^DBIx::Class/;
 use Lingua::EN::Inflect::Number ();
 
-our $VERSION = '0.03999_01';
+our $VERSION = '0.04000';
 
 =head1 NAME
 
@@ -155,21 +155,11 @@ sub generate_code {
             $cond{$remote_cols->[$i]} = $local_cols->[$i];
         }
 
-        # If more than one rel between this pair of tables, use the
-        #  local col name(s) as the relname in the foreign source, instead
-        #  of the local table name.
         my $local_relname;
-        if($counters{$remote_moniker} > 1) {
-            $local_relname = $self->_inflect_plural(
-                lc($local_table) . q{_} . join(q{_}, @$local_cols)
-            );
-        } else {
-            $local_relname = $self->_inflect_plural(lc $local_table);
-        }
-
-        # for single-column case, set the relname to the column name,
-        # to make filter accessors work
         my $remote_relname;
+
+        # for single-column case, set the remote relname to the column
+        # name, to make filter accessors work
         if(scalar keys %cond == 1) {
             my ($col) = keys %cond;
             $remote_relname = $self->_inflect_singular($cond{$col});
@@ -178,6 +168,18 @@ sub generate_code {
             $remote_relname = $self->_inflect_singular(lc $remote_table);
         }
 
+        # If more than one rel between this pair of tables, use the local
+        # col names to distinguish
+        if($counters{$remote_moniker} > 1) {
+            my $colnames = q{_} . join(q{_}, @$local_cols);
+            $local_relname = $self->_inflect_plural(
+                lc($local_table) . $colnames
+            );
+            $remote_relname .= $colnames if keys %cond > 1;
+        } else {
+            $local_relname = $self->_inflect_plural(lc $local_table);
+        }
+
         my %rev_cond = reverse %cond;
 
         for (keys %rev_cond) {