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

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2010-05-20 18:36:01 +0100 (Thu, 20 May 2010)
New Revision: 9408

Modified:
   DBIx-Class/0.08/trunk/Changes
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
Log:
fix result_class setter behaviour to not stuff attrs (line commented out to prevent this regression being mistakenly re-introduced)

Modified: DBIx-Class/0.08/trunk/Changes
===================================================================
--- DBIx-Class/0.08/trunk/Changes	2010-05-20 17:19:14 UTC (rev 9407)
+++ DBIx-Class/0.08/trunk/Changes	2010-05-20 17:36:01 UTC (rev 9408)
@@ -1,5 +1,7 @@
 Revision history for DBIx::Class
 
+        - 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/
           is not a subclass of DBIx::Class::ResultSet
         - ::Storage::DBI now correctly preserves a parent $dbh from

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:19:14 UTC (rev 9407)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2010-05-20 17:36:01 UTC (rev 9408)
@@ -1142,7 +1142,10 @@
       $self->ensure_class_loaded($result_class);
     }
     $self->_result_class($result_class);
-    $self->{attrs}{result_class} = $result_class if ref $self;
+    # THIS LINE WOULD BE A BUG - this accessor specifically exists to
+    # permit the user to set result class on one result set only; it only
+    # chains if provided to search()
+    #$self->{attrs}{result_class} = $result_class if ref $self;
   }
   $self->_result_class;
 }