[Bast-commits] r8626 - in DBIx-Class/0.08/branches/chaining_fixes: . lib/DBIx/Class

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2010-02-11 11:33:03 +0000 (Thu, 11 Feb 2010)
New Revision: 8626

Modified:
   DBIx-Class/0.08/branches/chaining_fixes/Changes
   DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm
Log:
Changes and small ommission

Modified: DBIx-Class/0.08/branches/chaining_fixes/Changes
===================================================================
--- DBIx-Class/0.08/branches/chaining_fixes/Changes	2010-02-11 11:21:52 UTC (rev 8625)
+++ DBIx-Class/0.08/branches/chaining_fixes/Changes	2010-02-11 11:33:03 UTC (rev 8626)
@@ -2,6 +2,7 @@
 
         - Add as_subselect_rs to DBIC::ResultSet from
           DBIC::Helper::ResultSet::VirtualView::as_virtual_view
+        - Make resultset chaining consistent wrt selection specification
 
 0.08118 2010-02-08 11:53:00 (UTC)
         - Fix a bug causing UTF8 columns not to be decoded (RT#54395)

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-11 11:21:52 UTC (rev 8625)
+++ DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm	2010-02-11 11:33:03 UTC (rev 8626)
@@ -291,14 +291,15 @@
     $rows = $self->get_cache;
   }
 
+  # reset the selector list
   if (List::Util::first { exists $attrs->{$_} } qw{columns select as}) {
-     delete @{$our_attrs}{qw{select as columns +select +as +columns}};
+     delete @{$our_attrs}{qw{select as columns +select +as +columns include_columns}};
   }
 
   my $new_attrs = { %{$our_attrs}, %{$attrs} };
 
   # merge new attrs into inherited
-  foreach my $key (qw/join prefetch +select +as +columns bind/) {
+  foreach my $key (qw/join prefetch +select +as +columns include_columns bind/) {
     next unless exists $attrs->{$key};
     $new_attrs->{$key} = $self->_merge_attr($our_attrs->{$key}, $attrs->{$key});
   }