X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=4e917a66485d242126248dc86701d6b6420153c6;hb=53751ffe20fcc7a21ef4028c6eadafcbbfb9d129;hp=a292f2dd001926aefdc669914d4f6cf1dd4c4b06;hpb=26f1c8c92bdbd5bf27e48005a1f3291ee7731a70;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 a292f2d..4e917a6 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.04003';
+our $VERSION = '0.04999_06';
 
 =head1 NAME
 
@@ -170,10 +170,11 @@ sub generate_code {
         my $remote_relname;
 
         # for single-column case, set the remote relname to the column
-        # name, to make filter accessors work
+        # name, to make filter accessors work, but strip trailing _id
         if(scalar keys %cond == 1) {
-            my ($col) = keys %cond;
-            $remote_relname = $self->_inflect_singular($cond{$col});
+            my ($col) = values %cond;
+            $col =~ s/_id$//;
+            $remote_relname = $self->_inflect_singular($col);
         }
         else {
             $remote_relname = $self->_inflect_singular(lc $remote_table);
@@ -201,18 +202,23 @@ sub generate_code {
         my $remote_method = 'has_many';
 
         # If the local columns have a UNIQUE constraint, this is a one-to-one rel
-        my $primary = [ $self->{schema}->source($local_moniker)->primary_columns ];
-        if (_array_eq($primary, $local_cols) ||
+        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);
         }
 
+        # If the referring column is nullable, make 'belongs_to' an outer join:
+        my $nullable = grep { $local_source->column_info($_)->{is_nullable} }
+          @$local_cols;
+
         push(@{$all_code->{$local_class}},
             { method => 'belongs_to',
               args => [ $remote_relname,
                         $remote_class,
                         \%cond,
+                        $nullable ? { join_type => 'LEFT' } : ()
               ],
             }
         );