use relationship name as alias name in belongs_to relationship

vti · Aug 31, 2011 · e4d1039 · e4d1039
1 parent 08e18df
commit e4d1039
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/lib/ObjectDB/Finder.pm b/lib/ObjectDB/Finder.pm
@@ -517,10 +517,13 @@ sub _resolve_with {
 
                 # Add source before resolving children to get correct order
                 # Add where constraint as join args
-                $source = $rel->to_source($args->{where}, $alias_prefix);
+                $source =
+                  $rel->to_source($args->{where}, $alias_prefix,
+                    $args->{parent_name});
                 $sql->add_source($source);
 
                 if (my $subwith = $args->{nested}) {
+                    $subwith->[1]->{parent_name} = $source->{as} if @$subwith;
                     _execute_code_ref($code_ref, $rel->foreign_class,
                         $subwith, $rel_chain, $table_chain, $args);
                 }

diff --git a/lib/ObjectDB/Relationship/BelongsTo.pm b/lib/ObjectDB/Relationship/BelongsTo.pm
@@ -32,18 +32,11 @@ sub to_source {
     my $self             = shift;
     my $passed_join_args = shift;
     my $alias_prefix     = shift || '';
+    my $table            = shift || $self->table;
 
-    my $table         = $self->table;
     my $foreign_table = $self->foreign_table;
 
-
-    my $as;
-    if ($foreign_table eq $table) {
-        $as = $alias_prefix . $self->name;
-    }
-    else {
-        $as = $alias_prefix . $foreign_table;
-    }
+    my $as = $alias_prefix . $self->name;
 
     my $constraint;
 

diff --git a/t/relationship/belongs-to-one.t b/t/relationship/belongs-to-one.t
@@ -29,9 +29,9 @@ is($rel->foreign_table, 'authors');
 is_deeply(
     $rel->to_source,
     {   name       => 'authors',
-        as         => 'authors',
+        as         => 'author',
         join       => 'left',
-        constraint => ['authors.id' => \'`author_admins`.`author_id`']
+        constraint => ['author.id' => \'`author_admins`.`author_id`']
     }
 );
 
diff --git a/t/relationship/belongs-to.t b/t/relationship/belongs-to.t
@@ -30,11 +30,11 @@ is($rel->foreign_table, 'authors');
 is_deeply(
     $rel->to_source,
     {   name       => 'authors',
-        as         => 'authors',
+        as         => 'author',
         join       => 'left',
         constraint => [
-            'authors.id'    => \'`articles`.`author_id`',
-            'authors.title' => \'foo'
+            'author.id'    => \'`articles`.`author_id`',
+            'author.title' => \'foo'
         ]
     }
 );