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

diff --git a/t/lib/DBICTest/Schema/Artist.pm b/t/lib/DBICTest/Schema/Artist.pm
index 48538bc..20affe0 100644
--- a/t/lib/DBICTest/Schema/Artist.pm
+++ b/t/lib/DBICTest/Schema/Artist.pm
@@ -1,7 +1,11 @@
-package # hide from PAUSE 
+package # hide from PAUSE
     DBICTest::Schema::Artist;
 
+use warnings;
+use strict;
+
 use base qw/DBICTest::BaseResult/;
+use Carp qw/confess/;
 
 __PACKAGE__->table('artist');
 __PACKAGE__->source_info({
@@ -51,6 +55,14 @@ __PACKAGE__->has_many(
   sub {
     my $args = shift;
 
+    # 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 @missing_args = grep { ! defined $args->{$_} }
+      qw/self_alias foreign_alias self_resultsource foreign_relname/;
+    confess "Required arguments not supplied to custom rel coderef: @missing_args\n"
+      if @missing_args;
+
     return (
       { "$args->{foreign_alias}.artist" => { '=' => { -ident => "$args->{self_alias}.artistid"} },
         "$args->{foreign_alias}.year"   => { '>' => 1979, '<' => 1990 },
@@ -63,13 +75,27 @@ __PACKAGE__->has_many(
   },
 );
 
+
 __PACKAGE__->has_many(
-  cds_90s => 'DBICTest::Schema::CD',
+  cds_84 => 'DBICTest::Schema::CD',
   sub {
     my $args = shift;
+
+    # 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 @missing_args = grep { ! defined $args->{$_} }
+      qw/self_alias foreign_alias self_resultsource foreign_relname/;
+    confess "Required arguments not supplied to custom rel coderef: @missing_args\n"
+      if @missing_args;
+
     return (
       { "$args->{foreign_alias}.artist" => { -ident => "$args->{self_alias}.artistid" },
-        "$args->{foreign_alias}.year"   => { '>' => 1989, '<' => 2000 },
+        "$args->{foreign_alias}.year"   => 1984,
+      },
+      $args->{self_rowobj} && {
+        "$args->{foreign_alias}.artist" => $args->{self_rowobj}->artistid,
+        "$args->{foreign_alias}.year"   => 1984,
       }
     );
   }
@@ -77,16 +103,21 @@ __PACKAGE__->has_many(
 
 
 __PACKAGE__->has_many(
-  cds_84 => 'DBICTest::Schema::CD',
+  cds_90s => 'DBICTest::Schema::CD',
   sub {
     my $args = shift;
+
+    # 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 @missing_args = grep { ! defined $args->{$_} }
+      qw/self_alias foreign_alias self_resultsource foreign_relname/;
+    confess "Required arguments not supplied to custom rel coderef: @missing_args\n"
+      if @missing_args;
+
     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,
+        "$args->{foreign_alias}.year"   => { '>' => 1989, '<' => 2000 },
       }
     );
   }