[Bast-commits] r8545 - in DBIx-Class/0.08/branches/chaining_fixes: lib/DBIx/Class t

[frew at dev.catalyst.perl.org]

Author: frew
Date: 2010-02-04 19:32:54 +0000 (Thu, 04 Feb 2010)
New Revision: 8545

Modified:
   DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm
   DBIx-Class/0.08/branches/chaining_fixes/t/76select.t
Log:
fix incorrect test in t/76select.t and posit an incorrect solution

Modified: DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm	2010-02-04 19:19:51 UTC (rev 8544)
+++ DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm	2010-02-04 19:32:54 UTC (rev 8545)
@@ -299,14 +299,10 @@
     $new_attrs->{$key} = $self->_merge_attr($our_attrs->{$key}, $attrs->{$key});
   }
 
-  if (List::Util::first { exists $new_attrs->{$_} } qw{select as}) {
-     delete $new_attrs->{$_} for (qw{+select +as});
+  if (List::Util::first { exists $new_attrs->{$_} } qw{select as columns}) {
+     delete $new_attrs->{$_} for (qw{+select +as +columns});
   }
 
-  if (exists $new_attrs->{columns}) {
-     delete $new_attrs->{'+columns'};
-  }
-
   my $cond = (@_
     ? (
         (@_ == 1 || ref $_[0] eq "HASH")

Modified: DBIx-Class/0.08/branches/chaining_fixes/t/76select.t
===================================================================
--- DBIx-Class/0.08/branches/chaining_fixes/t/76select.t	2010-02-04 19:19:51 UTC (rev 8544)
+++ DBIx-Class/0.08/branches/chaining_fixes/t/76select.t	2010-02-04 19:32:54 UTC (rev 8545)
@@ -89,13 +89,13 @@
 }, 'columns 2nd rscolumn present');
 
 lives_ok(sub {
-  $rs->first->artist->get_column('name') 
-}, 'columns 3rd rscolumn present'); 
+  $rs->first->artist->get_column('name')
+}, 'columns 3rd rscolumn present');
 
 
 
 $rs = $schema->resultset('CD')->search({},
-    {  
+    {
         'join' => 'artist',
         '+columns' => ['cdid', 'title', 'artist.name'],
     }
@@ -109,7 +109,7 @@
 );
 
 lives_ok(sub {
-  $rs->first->get_column('cdid') 
+  $rs->first->get_column('cdid')
 }, 'columns 1st rscolumn present');
 
 lives_ok(sub {
@@ -160,7 +160,6 @@
     track_position => 2,
     tracks =>
       {
-        trackid => 17,
         title => 'Apiary',
       },
   },