X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=9bc01c6a2f67da9c1767086c2befa49678e1b7c5;hb=c3fb509f26163ea4760053474e0ebb03f6fc98c4;hp=0a29af1c38ca12e4ab619beb3f1d1388fcbf010c;hpb=e344eed6c9cf62f2e5e78a31d8c499014a16c68c;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
index 0a29af1..9bc01c6 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp::Clan qw/^DBIx::Class/;
 use Lingua::EN::Inflect::Number ();
 
-our $VERSION = '0.04999_02';
+our $VERSION = '0.04999_09';
 
 =head1 NAME
 
@@ -132,6 +132,50 @@ sub _array_eq {
     return 1;
 }
 
+sub _uniq_fk_rel {
+    my ($self, $local_moniker, $local_relname, $local_cols, $uniqs) = @_;
+
+    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 (_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);
+    }
+
+    return ($remote_method, $local_relname);
+}
+
+sub _remote_attrs {
+	my ($self, $local_moniker, $local_cols) = @_;
+
+	# If the referring column is nullable, make 'belongs_to' an outer join:
+	my $nullable = grep { $self->{schema}->source($local_moniker)->column_info($_)->{is_nullable} }
+		@$local_cols;
+
+	return $nullable ? { join_type => 'LEFT' } : ();
+}
+
+sub _remote_relname {
+    my ($self, $remote_table, $cond) = @_;
+
+    my $remote_relname;
+    # for single-column case, set the remote relname to the column
+    # name, to make filter accessors work, but strip trailing _id
+    if(scalar keys %{$cond} == 1) {
+        my ($col) = values %{$cond};
+        $col =~ s/_id$//;
+        $remote_relname = $self->_inflect_singular($col);
+    }
+    else {
+        $remote_relname = $self->_inflect_singular(lc $remote_table);
+    }
+
+    return $remote_relname;
+}
+
 sub generate_code {
     my ($self, $local_moniker, $rels, $uniqs) = @_;
 
@@ -167,17 +211,7 @@ sub generate_code {
         }
 
         my $local_relname;
-        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) {
-            my ($col) = keys %cond;
-            $remote_relname = $self->_inflect_singular($cond{$col});
-        }
-        else {
-            $remote_relname = $self->_inflect_singular(lc $remote_table);
-        }
+        my $remote_relname = $self->_remote_relname($remote_table, \%cond);
 
         # If more than one rel between this pair of tables, use the local
         # col names to distinguish
@@ -198,26 +232,16 @@ sub generate_code {
             delete $rev_cond{$_};
         }
 
-        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 (_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);
-        }
+        my ($remote_method);
 
-        # If the referring column is nullable, make 'belongs_to' an outer join:
-        my $nullable = grep { $local_source->column_info($_)->{is_nullable} }
-          @$local_cols;
+        ($remote_method, $local_relname) = $self->_uniq_fk_rel($local_moniker, $local_relname, $local_cols, $uniqs);
 
         push(@{$all_code->{$local_class}},
             { method => 'belongs_to',
               args => [ $remote_relname,
                         $remote_class,
                         \%cond,
-                        $nullable ? { join_type => 'LEFT OUTER' } : ()
+                        $self->_remote_attrs($local_moniker, $local_cols),
               ],
             }
         );