split off the new _id stripping into _multi_rel_local_relname overridden in the v4...

diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
index 4121f64..b810d7c 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -247,16 +247,10 @@ sub generate_code {
         # col names to distinguish
         if($counters{$remote_moniker} > 1) {
             my $colnames = q{_} . join(q{_}, @$local_cols);
-            my $old_relname = #< TODO: remove me after 0.05003 release
-                $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 );
             $remote_relname .= $colnames if keys %cond > 1;
-
-            # TODO: remove me after 0.05003 release
-            $old_relname = $self->_inflect_plural( $old_relname );
-            warn __PACKAGE__." $VERSION: warning, stripping trailing _id from ${remote_class} relation '$old_relname', renaming to '$local_relname'.  This behavior is new as of 0.05003.\n"
-                if $stripped_id;
+            $local_relname   = $self->_multi_rel_local_relname(
+                $local_table, $local_cols
+            );
         } else {
             $local_relname = $self->_inflect_plural(lc $local_table);
         }
@@ -296,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>.

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 cc33c90..7b4451e 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm
@@ -30,6 +30,15 @@ sub _remote_relname {
     return $remote_relname;
 }
 
+sub _multi_rel_local_relname {
+    my ($self, $local_table, $local_cols) = @_;
+
+    my $colnames = q{_} . join(q{_}, @$local_cols);
+    my $local_relname = $self->_inflect_plural( lc($local_table) . $colnames );
+
+    return $local_relname;
+}
+
 1;
 
 =head1 NAME