X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=b810d7cc2e9f3fe2af7147e77c156994a4d7dc0f;hb=fa6f8d4e55abe58e20f7fdeaa79dfc6e9d31fa10;hp=4d5912a4e0551bb7d18a47633b4b5bead8346861;hpb=04e60ed2698d8c8cf2d817cace84f94827bbbc4f;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 4d5912a..b810d7c 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -6,7 +6,7 @@ use Class::C3;
 use Carp::Clan qw/^DBIx::Class/;
 use Lingua::EN::Inflect::Number ();
 
-our $VERSION = '0.04999_14';
+our $VERSION = '0.05002';
 
 =head1 NAME
 
@@ -247,10 +247,10 @@ sub generate_code {
         # 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;
+            $local_relname   = $self->_multi_rel_local_relname(
+                $local_table, $local_cols
+            );
         } else {
             $local_relname = $self->_inflect_plural(lc $local_table);
         }
@@ -290,6 +290,23 @@ sub generate_code {
     return $all_code;
 }
 
+sub _multi_rel_local_relname {
+    my ($self, $local_table, $local_cols) = @_;
+
+    my $colnames = q{_} . join(q{_}, @$local_cols);
+    my $old_relname = #< TODO: remove me after 0.05003 release
+    my $local_relname = lc($local_table) . $colnames;
+    my $stripped_id = $local_relname =~ s/_id$//; #< strip off any trailing _id
+    $local_relname = $self->_inflect_plural( $local_relname );
+
+    # TODO: remove me after 0.05003 release
+    $old_relname = $self->_inflect_plural( $old_relname );
+    warn __PACKAGE__." $VERSION: warning, stripping trailing _id from ${local_table} relation '$old_relname', renaming to '$local_relname'.  This behavior is new as of 0.05003.\n"
+        if $stripped_id;
+
+    return $local_relname;
+}
+
 =head1 AUTHOR
 
 See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.