[Bast-commits] r3804 - in DBIx-Class/0.08/trunk: lib/DBIx/Class t

[captainL at dev.catalyst.perl.org]

Author: captainL
Date: 2007-10-04 21:54:08 +0100 (Thu, 04 Oct 2007)
New Revision: 3804

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
   DBIx-Class/0.08/trunk/t/66relationship.t
Log:
fixed search_related from object with unset FK behaviour

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm	2007-10-04 16:29:15 UTC (rev 3803)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm	2007-10-04 20:54:08 UTC (rev 3804)
@@ -790,7 +790,7 @@
         $self->throw_exception("Invalid rel cond val ${v}");
       if (ref $for) { # Object
         #warn "$self $k $for $v";
-        $ret{$k} = $for->get_column($v);
+        $ret{$k} = $for->get_column($v) if $for->has_column_loaded($v);
         #warn %ret;
       } elsif (!defined $for) { # undef, i.e. "no object"
         $ret{$k} = undef;

Modified: DBIx-Class/0.08/trunk/t/66relationship.t
===================================================================
--- DBIx-Class/0.08/trunk/t/66relationship.t	2007-10-04 16:29:15 UTC (rev 3803)
+++ DBIx-Class/0.08/trunk/t/66relationship.t	2007-10-04 20:54:08 UTC (rev 3804)
@@ -7,7 +7,7 @@
 
 my $schema = DBICTest->init_schema();
 
-plan tests => 58;
+plan tests => 62;
 
 # has_a test
 my $cd = $schema->resultset("CD")->find(4);
@@ -117,8 +117,7 @@
   name => 'Random Boy Band Two',
   artistid => 200,
 } );
-$cd->result_source->schema->storage->debug(0);
-
+# $cd->result_source->schema->storage->debug(0);
 is($newartist->name, 'Random Boy Band Two', 'find_or_new_related new artist record with id');
 is($newartist->id, 200, 'find_or_new_related new artist id set');
 
@@ -204,7 +203,14 @@
 is( $twokey->fourkeys_to_twokeys->count, 0,
     'twokey has no links to fourkey' );
 
+my $undef_artist_cd = $schema->resultset("CD")->new_result({ 'title' => 'badgers', 'year' => 2007 });
+is($undef_artist_cd->has_column_loaded('artist'), '', 'FK not loaded');
+is($undef_artist_cd->search_related('artist')->count, 3, 'open search on undef FK');
 
+my $def_artist_cd = $schema->resultset("CD")->new_result({ 'title' => 'badgers', 'year' => 2007, artist => undef });
+is($def_artist_cd->has_column_loaded('artist'), 1, 'FK loaded');
+is($def_artist_cd->search_related('artist')->count, 0, 'closed search on null FK');
+
 # test undirected many-to-many relationship (e.g. "related artists")
 my $undir_maps = $schema->resultset("Artist")->find(1)->artist_undirected_maps;
 is($undir_maps->count, 1, 'found 1 undirected map for artist 1');