X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FDBICTest%2FSchema%2FTrack.pm;h=10d49f7b41e5416b474f2a48e172bd4c7cd324c6;hb=0f6d86e4c025273bdbe5d6527e44d7b42b7fede8;hp=a1cb27a1b1d86f2616d12e0de3aab14e9bf1f7d5;hpb=78b3d153ad874085ee183cfa6ad827089adde583;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/lib/DBICTest/Schema/Track.pm b/t/lib/DBICTest/Schema/Track.pm
index a1cb27a..10d49f7 100644
--- a/t/lib/DBICTest/Schema/Track.pm
+++ b/t/lib/DBICTest/Schema/Track.pm
@@ -66,13 +66,13 @@ sub {
       "$args->{foreign_alias}.cdid" => { -ident => "$args->{self_alias}.cd" },
     },
 
-    ( $args->{self_resultobj} ? {
-     "$args->{foreign_alias}.cdid" => $args->{self_resultobj}->cd
-    } : () ),
+    ! $args->{self_result_object} ? () : {
+     "$args->{foreign_alias}.cdid" => $args->{self_result_object}->get_column('cd')
+    },
 
-    ( $args->{foreign_resultobj} ? {
-     "$args->{self_alias}.cd" => $args->{foreign_resultobj}->cdid
-    } : () ),
+    ! $args->{foreign_values} ? () : {
+     "$args->{self_alias}.cd" => $args->{foreign_values}{cdid}
+    },
   );
 }
 );
@@ -108,14 +108,28 @@ __PACKAGE__->has_many (
       { "$args->{foreign_alias}.cd"       => { -ident => "$args->{self_alias}.cd" },
         "$args->{foreign_alias}.position" => { '>' => { -ident => "$args->{self_alias}.position" } },
       },
-      $args->{self_resultobj} && {
-        "$args->{foreign_alias}.cd"       => $args->{self_resultobj}->get_column('cd'),
-        "$args->{foreign_alias}.position" => { '>' => $args->{self_resultobj}->pos },
+      $args->{self_result_object} && {
+        "$args->{foreign_alias}.cd"       => $args->{self_result_object}->get_column('cd'),
+        "$args->{foreign_alias}.position" => { '>' => $args->{self_result_object}->pos },
       }
     )
   }
 );
 
+__PACKAGE__->has_many (
+  deliberately_broken_all_cd_tracks => __PACKAGE__,
+  sub {
+    # This is for test purposes only. A regular user does not
+    # need to sanity check the passed-in arguments, this is what
+    # the tests are for :)
+    my $args = &check_customcond_args;
+
+    return {
+      "$args->{foreign_alias}.cd" => "$args->{self_alias}.cd"
+    };
+  }
+);
+
 our $hook_cb;
 
 sub sqlt_deploy_hook {