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;fp=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder%2FCompat%2Fv0_040.pm;h=5909eed65bc72ff4cc5b9009f63fae94fdb0dc81;hb=d75f8e7993a24250d69ed775830b1e366aa8d458;hp=871a90617a877675fcb4c6d1c10cb18c7eeb1ab1;hpb=a00a81fd4ce4a6aa9ebafd1c4683b681b6fdd095;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 871a906..5909eed 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm @@ -17,23 +17,23 @@ sub _relnames_and_method { my $local_cols = $rel->{local_columns}; # for single-column case, set the remote relname to just the column name - my ($remote_relname) = + my ($local_relname) = scalar keys %{$cond} == 1 ? $self->_inflect_singular( values %$cond ) : $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; + my $remote_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 ); + $local_relname .= $colnames if keys %$cond > 1; + ($remote_relname) = $self->_inflect_plural( lc($local_table) . $colnames ); } else { - ($local_relname) = $self->_inflect_plural(lc $local_table); + ($remote_relname) = $self->_inflect_plural(lc $local_table); } - return ( $local_relname, $remote_relname, 'has_many' ); + return ( $remote_relname, $local_relname, 'has_many' ); } sub _remote_attrs { }