[Bast-commits] r3295 - branches/DBIx-Class-current/lib/DBIx/Class

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2007-05-11 03:56:11 +0100 (Fri, 11 May 2007)
New Revision: 3295

Modified:
   branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm
Log:
post-merge fixups

Modified: branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm
===================================================================
--- branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm	2007-05-11 02:53:24 UTC (rev 3294)
+++ branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm	2007-05-11 02:56:11 UTC (rev 3295)
@@ -98,8 +98,8 @@
   $attrs->{alias} ||= 'me';
 
   my $self = {
-    result_source => $source,
-    result_class => $attrs->{result_class} || $source->result_class,
+    _source_handle => $source,
+    result_class => $attrs->{result_class} || $source->resolve->result_class,
     cond => $attrs->{where},
     count => undef,
     pager => undef,
@@ -826,8 +826,6 @@
       }
   );
 
-  # THIS BIT STILL NEEDS TO DO THE COLLAPSE
-
   my $alias = $self->{attrs}{alias};
   my $info = [];