X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder%2FCompat%2Fv0_05.pm;h=eb6fa55276a10d5c7a21f8de3212d35e1d77c7d8;hb=802a117545a5bd1a5d20152835a3aa7fb2e7b39f;hp=0a3aa8d2bb5c22c62d03df1a77fdfa63d990aaa4;hpb=c697835eacc34e76036a6e91cc4b0bc1ccd05f69;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm
index 0a3aa8d..eb6fa55 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm
@@ -2,12 +2,13 @@ package DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_05;
 
 use strict;
 use warnings;
-use mro 'c3';
 use base 'DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_06';
-use Carp::Clan qw/^DBIx::Class/;
+use mro 'c3';
+use DBIx::Class::Schema::Loader::Utils 'array_eq';
+use namespace::clean;
 use Lingua::EN::Inflect::Number ();
 
-our $VERSION = '0.07005';
+our $VERSION = '0.07041';
 
 sub _to_PL {
     my ($self, $name) = @_;
@@ -29,35 +30,35 @@ sub _relnames_and_method {
     my $remote_moniker = $rel->{remote_source};
     my $remote_obj     = $self->{schema}->source( $remote_moniker );
     my $remote_class   = $self->{schema}->class(  $remote_moniker );
-    my $remote_relname = $self->_remote_relname( $remote_obj->from, $cond);
+    my $local_relname  = $self->_local_relname( $rel->{remote_table}, $cond);
 
     my $local_cols  = $rel->{local_columns};
-    my $local_table = $self->{schema}->source($local_moniker)->from;
+    my $local_table = $rel->{local_table};
 
     # If more than one rel between this pair of tables, use the local
     # col names to distinguish
-    my ($local_relname, $local_relname_uninflected);
+    my ($remote_relname, $remote_relname_uninflected);
     if ( $counters->{$remote_moniker} > 1) {
         my $colnames = lc(q{_} . join(q{_}, map lc($_), @$local_cols));
-        $remote_relname .= $colnames if keys %$cond > 1;
+        $local_relname .= $colnames if keys %$cond > 1;
 
-        $local_relname = lc($local_table) . $colnames;
+        $remote_relname = lc($local_table) . $colnames;
 
-        $local_relname_uninflected = $local_relname;
-        $local_relname = $self->_inflect_plural( $local_relname );
+        $remote_relname_uninflected = $remote_relname;
+        ($remote_relname) = $self->_inflect_plural( $remote_relname );
     } else {
-        $local_relname_uninflected = lc $local_table;
-        $local_relname = $self->_inflect_plural(lc $local_table);
+        $remote_relname_uninflected = lc $local_table;
+        ($remote_relname) = $self->_inflect_plural(lc $local_table);
     }
 
     my $remote_method = 'has_many';
 
     # If the local columns have a UNIQUE constraint, this is a one-to-one rel
     my $local_source = $self->{schema}->source($local_moniker);
-    if ($self->_array_eq([ $local_source->primary_columns ], $local_cols) ||
-            grep { $self->_array_eq($_->[1], $local_cols) } @$uniqs) {
+    if (array_eq([ $local_source->primary_columns ], $local_cols) ||
+            grep { array_eq($_->[1], $local_cols) } @$uniqs) {
         $remote_method = 'might_have';
-        $local_relname = $self->_inflect_singular($local_relname_uninflected);
+        ($remote_relname) = $self->_inflect_singular($remote_relname_uninflected);
     }
 
     return ( $local_relname, $remote_relname, $remote_method );