X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder%2FCompat%2Fv0_040.pm;h=7d7dc8645ef09c3aa55d194d7164f7cd3f9eb8a6;hb=3bdcf490c99abda52aea5346fddb6f9f6c43bb2c;hp=3d12a25cb3f9f26912be46d4f7e4f07cc692871a;hpb=7824616e3b2560fc34b1c79a2098b4a013d27b7f;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

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 3d12a25..7d7dc86 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm
@@ -2,33 +2,63 @@ package DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_040;
 
 use strict;
 use warnings;
-use Class::C3;
+use mro 'c3';
+use base 'DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_05';
+use Carp::Clan qw/^DBIx::Class/;
+use Lingua::EN::Inflect::Number ();
 
-use base 'DBIx::Class::Schema::Loader::RelBuilder';
+our $VERSION = '0.07008';
 
-sub _uniq_fk_rel {
-    my ($self, $local_moniker, $local_relname, $local_cols, $uniqs) = @_;
+sub _relnames_and_method {
+    my ( $self, $local_moniker, $rel, $cond, $uniqs, $counters ) = @_;
 
-    return ('has_many', $local_relname);
-}
+    my $remote_moniker = $rel->{remote_source};
+    my $remote_table   = $self->{schema}->source( $remote_moniker )->from;
 
-sub _remote_attrs { }
+    my $local_table = $self->{schema}->source($local_moniker)->from;
+    my $local_cols  = $rel->{local_columns};
 
-sub _remote_relname {
-    my ($self, $remote_table, $cond) = @_;
+    # for single-column case, set the remote relname to just the column name
+    my $remote_relname =
+        scalar keys %{$cond} == 1
+            ? $self->_inflect_singular( values %$cond  )
+            : $self->_inflect_singular( lc $remote_table );
 
-    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) {
-        $remote_relname = $self->_inflect_singular(values %{$cond});
-    }
-    else {
-        $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
+    my $local_relname;
+    if ($counters->{$remote_moniker} > 1) {
+        my $colnames = '_' . join( '_', @$local_cols );
+        $remote_relname .= $colnames if keys %$cond > 1;
+        $local_relname = $self->_inflect_plural( lc($local_table) . $colnames );
+    } else {
+        $local_relname = $self->_inflect_plural(lc $local_table);
     }
 
-    return $remote_relname;
+    return ( $local_relname, $remote_relname, 'has_many' );
 }
 
+sub _remote_attrs { }
+
+=head1 NAME
+
+DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_040 - RelBuilder for
+compatibility with DBIx::Class::Schema::Loader version 0.04006
+
+=head1 DESCRIPTION
+
+See L<DBIx::Class::Schema::Loader::Base/naming> and
+L<DBIx::Class::Schema::Loader::RelBuilder>.
+
+=head1 AUTHOR
+
+See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+
+=head1 LICENSE
+
+This library is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut
 
 1;