[Bast-commits] r9410 - in DBIx-Class/0.08/trunk: . lib/DBIx/Class

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2010-05-20 19:09:52 +0100 (Thu, 20 May 2010)
New Revision: 9410

Modified:
   DBIx-Class/0.08/trunk/Changes
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
Log:
fix find() since that was also broken in r8754

Modified: DBIx-Class/0.08/trunk/Changes
===================================================================
--- DBIx-Class/0.08/trunk/Changes	2010-05-20 17:49:32 UTC (rev 9409)
+++ DBIx-Class/0.08/trunk/Changes	2010-05-20 18:09:52 UTC (rev 9410)
@@ -1,5 +1,6 @@
 Revision history for DBIx::Class
 
+        - Fix find() to use result_class set on object
         - Fix result_class setter behaviour to not mistakenly stuff attrs.
         - Don't try and ensure_class_loaded an object. This doesn't work.
         - Add a warning to load_namespaces if a class in ResultSet/

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2010-05-20 17:49:32 UTC (rev 9409)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2010-05-20 18:09:52 UTC (rev 9410)
@@ -538,8 +538,8 @@
       : $self->_add_alias($input_query, $alias);
   }
 
-  # Run the query
-  my $rs = $self->search ($query, $attrs);
+  # Run the query, passing the result_class since it should propagate for find
+  my $rs = $self->search ($query, {result_class => $self->result_class, %$attrs});
   if (keys %{$rs->_resolved_attrs->{collapse}}) {
     my $row = $rs->next;
     carp "Query returned more than one row" if $rs->next;