X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FDBICTest%2FSchema%2FCD.pm;h=45fdf6fe9e06f9cbb8b4bbba372384dbba9095bf;hb=6e22e629bb00f5c721a6fbec0017596c1e28dde3;hp=9a147d8fe974a97401e3148730ca9f19384e6abe;hpb=fe4118b138326291850bbe2438f61cd0e296034b;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/lib/DBICTest/Schema/CD.pm b/t/lib/DBICTest/Schema/CD.pm
index 9a147d8..45fdf6f 100644
--- a/t/lib/DBICTest/Schema/CD.pm
+++ b/t/lib/DBICTest/Schema/CD.pm
@@ -1,6 +1,9 @@
-package # hide from PAUSE 
+package # hide from PAUSE
     DBICTest::Schema::CD;
 
+use warnings;
+use strict;
+
 use base qw/DBICTest::BaseResult/;
 
 # this tests table name as scalar ref
@@ -23,7 +26,7 @@ __PACKAGE__->add_columns(
     data_type => 'varchar',
     size      => 100,
   },
-  'genreid' => { 
+  'genreid' => {
     data_type => 'integer',
     is_nullable => 1,
     accessor => undef,
@@ -37,17 +40,23 @@ __PACKAGE__->add_columns(
 __PACKAGE__->set_primary_key('cdid');
 __PACKAGE__->add_unique_constraint([ qw/artist title/ ]);
 
-__PACKAGE__->belongs_to( artist => 'DBICTest::Schema::Artist', undef, { 
-    is_deferrable => 1, 
+__PACKAGE__->belongs_to( artist => 'DBICTest::Schema::Artist', undef, {
+    is_deferrable => 1,
     proxy => { artist_name => 'name' },
 });
-__PACKAGE__->belongs_to( very_long_artist_relationship => 'DBICTest::Schema::Artist', 'artist', { 
-    is_deferrable => 1, 
+__PACKAGE__->belongs_to( very_long_artist_relationship => 'DBICTest::Schema::Artist', 'artist', {
+    is_deferrable => 1,
 });
 
 # in case this is a single-cd it promotes a track from another cd
-__PACKAGE__->belongs_to( single_track => 'DBICTest::Schema::Track', 'single_track', 
-    { join_type => 'left'} 
+__PACKAGE__->belongs_to( single_track => 'DBICTest::Schema::Track',
+  { 'foreign.trackid' => 'self.single_track' },
+  { join_type => 'left'},
+);
+
+# add a non-left single relationship for the complex prefetch tests
+__PACKAGE__->belongs_to( existing_single_track => 'DBICTest::Schema::Track',
+  { 'foreign.trackid' => 'self.single_track' },
 );
 
 __PACKAGE__->has_many( tracks => 'DBICTest::Schema::Track' );
@@ -59,6 +68,8 @@ __PACKAGE__->has_many(
     cd_to_producer => 'DBICTest::Schema::CD_to_Producer' => 'cd'
 );
 
+# the undef condition in this rel is *deliberate*
+# tests oddball legacy syntax
 __PACKAGE__->might_have(
     liner_notes => 'DBICTest::Schema::LinerNotes', undef,
     { proxy => [ qw/notes/ ] },
@@ -73,7 +84,7 @@ __PACKAGE__->many_to_many(
 );
 
 __PACKAGE__->belongs_to('genre', 'DBICTest::Schema::Genre',
-    { 'foreign.genreid' => 'self.genreid' },
+    'genreid',
     {
         join_type => 'left',
         on_delete => 'SET NULL',