X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FDBICTest%2FSchema%2FArtist.pm;h=48538bcef0b22af1a4028a0bc9927543879bf673;hb=d5a14c53a280677a116b2efb393853a783281b2a;hp=0a201283bd3ddae0cfd9fc2673f1a8c5c8c53c7c;hpb=9aae35666a35bad290f55e574d053a074c1d6757;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/lib/DBICTest/Schema/Artist.pm b/t/lib/DBICTest/Schema/Artist.pm
index 0a20128..48538bc 100644
--- a/t/lib/DBICTest/Schema/Artist.pm
+++ b/t/lib/DBICTest/Schema/Artist.pm
@@ -47,43 +47,48 @@ __PACKAGE__->has_many(
 
 
 __PACKAGE__->has_many(
-    cds_80s => 'DBICTest::Schema::CD',
-    sub {
-      my ( $me_alias, $rel_alias, $me_result_source, $rel_name, $optional_me_object ) = @_;
-      return
-        ({ "${rel_alias}.artist"  => { '=' => \"${me_alias}.artistid"},
-           "${rel_alias}.year"    => { '>', "1979",
-                                       '<', "1990" }
-         },
-         $optional_me_object &&
-         { "${rel_alias}.artist" => $optional_me_object->artistid,
-           "${rel_alias}.year"   => { '>', "1979",
-                                      '<', "1990" }
-       });
-  }
+  cds_80s => 'DBICTest::Schema::CD',
+  sub {
+    my $args = shift;
+
+    return (
+      { "$args->{foreign_alias}.artist" => { '=' => { -ident => "$args->{self_alias}.artistid"} },
+        "$args->{foreign_alias}.year"   => { '>' => 1979, '<' => 1990 },
+      },
+      $args->{self_rowobj} && {
+        "$args->{foreign_alias}.artist" => $args->{self_rowobj}->artistid,
+        "$args->{foreign_alias}.year"   => { '>' => 1979, '<' => 1990 },
+      }
+    );
+  },
 );
 
 __PACKAGE__->has_many(
-    cds_80s_noopt => 'DBICTest::Schema::CD',
-    sub {
-      my ( $me_alias, $rel_alias, $me_result_source, $rel_name, $optional_me_object ) = @_;
-      return
-        ({ "${rel_alias}.artist"  => { '=' => \"${me_alias}.artistid"},
-           "${rel_alias}.year"    => { '>', "1979",
-                                       '<', "1990" }
-         });
+  cds_90s => 'DBICTest::Schema::CD',
+  sub {
+    my $args = shift;
+    return (
+      { "$args->{foreign_alias}.artist" => { -ident => "$args->{self_alias}.artistid" },
+        "$args->{foreign_alias}.year"   => { '>' => 1989, '<' => 2000 },
+      }
+    );
   }
 );
 
+
 __PACKAGE__->has_many(
-    cds_90s => 'DBICTest::Schema::CD',
-    sub {
-      my ( $me_alias, $rel_alias, $me_result_source, $rel_name, $optional_me_object ) = @_;
-      return
-        ({ "${rel_alias}.artist"  => { '=' => \"${me_alias}.artistid"},
-           "${rel_alias}.year"    => { '>', "1989",
-                                       '<', "2000" }
-         });
+  cds_84 => 'DBICTest::Schema::CD',
+  sub {
+    my $args = shift;
+    return (
+      { "$args->{foreign_alias}.artist" => { -ident => "$args->{self_alias}.artistid" },
+        "$args->{foreign_alias}.year"   => 1984,
+      },
+      $args->{self_rowobj} && {
+        "$args->{foreign_alias}.artist" => $args->{self_rowobj}->artistid,
+        "$args->{foreign_alias}.year"   => 1984,
+      }
+    );
   }
 );