From: Rafael Kitover <rkitover@cpan.org>
Date: Thu, 26 May 2011 13:48:08 +0000 (-0400)
Subject: check for relname accessor collisions on duplicate disambiguation
X-Git-Tag: 0.07011~104
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=aa608e1adf8157a3ba891bbfc7ead3f03e1e9e5d;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

check for relname accessor collisions on duplicate disambiguation
---

diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
index 5345749..0145691 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -555,6 +555,8 @@ Could not find a proper name for relationship '$relname_new' in source '$moniker
 Supply a value in '$inflect_type' for '$relname_new_uninflected' to name this relationship.
 EOF
 
+                $relname_new = $self->_resolve_relname_collision($moniker, \@from_cols, $relname_new);
+
                 $rel->{args}[0] = $relname_new;
             }
         }