projects
/
dbsrgits/DBIx-Class-Schema-Loader.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
check for relname accessor collisions on duplicate disambiguation
[dbsrgits/DBIx-Class-Schema-Loader.git]
/
lib
/
DBIx
/
Class
/
Schema
/
Loader
/
RelBuilder.pm
diff --git
a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
index
5345749
..
0145691
100644
(file)
--- 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;
}
}