Merge 'trunk' into 'replication_dedux'

r12028@dev (orig r4378):  captainL | 2008-05-11 13:43:58 -0500
added test for find or create related functionality in nested inserts
r12029@dev (orig r4379):  captainL | 2008-05-11 14:03:27 -0500
sanified new multi_create test
r12030@dev (orig r4381):  ribasushi | 2008-05-12 06:09:20 -0500
Add failing tests for missing safeguards for multilevel prefetch (don't know the internals well enough to fix the issue itself)

diff --git a/t/77prefetch.t b/t/77prefetch.t
index a8e0673..a7834ba 100644 (file)
--- a/t/77prefetch.t
+++ b/t/77prefetch.t
@@ -16,7 +16,7 @@ BEGIN {
     eval "use DBD::SQLite";
     plan $@
         ? ( skip_all => 'needs DBD::SQLite for testing' )
-        : ( tests => 56 );
+        : ( tests => 58 );
 }
 
 # figure out if we've got a version of sqlite that is older than 3.2.6, in
@@ -344,7 +344,8 @@ is($art_rs_pr->search_related('cds')->search_related('tracks')->first->title,
 
 is($queries, 0, 'chained search_related after has_many->has_many prefetch ran no queries');
 
-
+# once the following TODO is complete, remove the 2 stop-gap tests immediately after the TODO block
+# (the TODO block itself contains tests ensuring that the stop-gaps are removed)
 TODO: {
     local $TODO = 'Prefetch of multiple has_many rels at the same level (currently must die to protect the clueless git)';
     use DBIx::Class::ResultClass::HashRefInflator;
@@ -409,3 +410,8 @@ TODO: {
 
     is_deeply ([$pr_tags_rs->all], [$tags_rs->all], 'same structure returned with and without prefetch over several same level has_many\'s (M -> 1 -> M + M)');
 };
+
+eval { my $track = $schema->resultset('CD')->search ({ 'me.title' => 'Forkful of bees' }, { prefetch => [qw/tracks tags/] })->first->tracks->first };
+ok ($@, 'exception on attempt to prefetch several same level has_many\'s (1 -> M + M)');
+eval { my $tag = $schema->resultset('LinerNotes')->search ({ notes => 'Buy Whiskey!' }, { prefetch => { cd => [qw/tags tracks/] } })->first->cd->tags->first };
+ok ($@, 'exception on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)');

diff --git a/t/96multi_create.t b/t/96multi_create.t
index a6394cf..356aae6 100644 (file)
--- a/t/96multi_create.t
+++ b/t/96multi_create.t
@@ -196,6 +196,19 @@ my $new_cd = $schema->resultset("CD")->create($new_cd_hashref);
 is($new_cd->artist->id, 17, 'new id retained okay');
 
 
+# Test find or create related functionality
+my $new_artist = $schema->resultset("Artist")->create({ artistid => 18, name => 'larry' });
+
+eval {
+       $schema->resultset("CD")->create({ 
+              cdid => 28, 
+               title => 'Boogie Wiggle', 
+              year => '2007', 
+              artist => { artistid => 18, name => 'larry' }
+             });
+};
+is($@, '', 'new cd created without clash on related artist');
+
 # Make sure exceptions from errors in created rels propogate
 eval {
     my $t = $schema->resultset("Track")->new({});