Add tests for alias fix in [2815]

diff --git a/t/79aliasing.t b/t/79aliasing.t
index 6e73f10..94ae02b 100644 (file)
--- a/t/79aliasing.t
+++ b/t/79aliasing.t
@@ -7,12 +7,12 @@ use DBICTest;
 
 my $schema = DBICTest->init_schema();
 
-plan tests => 8;
-
-my $artist = $schema->resultset('Artist')->find(1);
+plan tests => 11;
 
 # Check that you can leave off the alias
 {
+  my $artist = $schema->resultset('Artist')->find(1);
+
   my $existing_cd = $artist->search_related('cds', undef, { prefetch => 'tracks' })->find_or_create({
     title => 'Ted',
     year  => 2006,
@@ -30,6 +30,8 @@ my $artist = $schema->resultset('Artist')->find(1);
 
 # Check that you can specify the alias
 {
+  my $artist = $schema->resultset('Artist')->find(1);
+
   my $existing_cd = $artist->search_related('cds', undef, { prefetch => 'tracks' })->find_or_create({
     'me.title' => 'Something Else',
     'me.year'  => 2006,
@@ -44,3 +46,13 @@ my $artist = $schema->resultset('Artist')->find(1);
   ok(! $new_cd->is_changed, 'find_or_create on prefetched has_many with same column names: row is clean');
   is($new_cd->title, 'Some New Guy', 'find_or_create on prefetched has_many with same column names: can be disambiguated with "me." for new entry');
 }
+
+# Don't pass column names with related alias to new_result
+{
+  my $cd_rs = $schema->resultset('CD')->search({ 'artist.name' => 'Caterwauler McCrae' }, { join => 'artist' });
+
+  my $cd = $cd_rs->find_or_new({ title => 'Huh?', year => 2006 });
+  ok(! $cd->in_storage, 'new CD not in storage yet');
+  is($cd->title, 'Huh?', 'new CD title is correct');
+  is($cd->year, 2006, 'new CD year is correct');
+}