[Bast-commits] r4260 - in branches/DBIx-Class-Schema-Loader/current: . lib/DBIx/Class/Schema/Loader t/lib

[ilmari at dev.catalyst.perl.org]

Author: ilmari
Date: 2008-04-13 01:48:53 +0100 (Sun, 13 Apr 2008)
New Revision: 4260

Modified:
   branches/DBIx-Class-Schema-Loader/current/Changes
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm
   branches/DBIx-Class-Schema-Loader/current/t/lib/dbixcsl_common_tests.pm
Log:
Make ResultSetManager notice externally defined :ResultSet methods
by calling $class->table($class->table) after loading the external
class definition.


Modified: branches/DBIx-Class-Schema-Loader/current/Changes
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Changes	2008-04-13 00:43:26 UTC (rev 4259)
+++ branches/DBIx-Class-Schema-Loader/current/Changes	2008-04-13 00:48:53 UTC (rev 4260)
@@ -6,6 +6,7 @@
         - Allow specifying a custom loader_class, overriding the
           storage_type-based detection
         - Cosmetic fixes to dumping of externally defined classes
+        - Make ResultSetManager notice externally defined :ResultSet methods
 
 0.04999_04 Wed Mar 12, 2008
         - Add is_auto_increment detecton for DB2

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm	2008-04-13 00:43:26 UTC (rev 4259)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm	2008-04-13 00:48:53 UTC (rev 4260)
@@ -298,6 +298,10 @@
     warn qq/# Loaded external class definition for '$class'\n/
         if $self->debug;
 
+    # Make sure ResultSetManager picks up any :ResultSet methods from
+    # the external definition
+    $class->table($class->table);
+
     # The rest is only relevant when dumping
     return if !$self->dump_directory;
 

Modified: branches/DBIx-Class-Schema-Loader/current/t/lib/dbixcsl_common_tests.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/t/lib/dbixcsl_common_tests.pm	2008-04-13 00:43:26 UTC (rev 4259)
+++ branches/DBIx-Class-Schema-Loader/current/t/lib/dbixcsl_common_tests.pm	2008-04-13 00:48:53 UTC (rev 4260)
@@ -171,12 +171,8 @@
         can_ok( $class1, 'test_additional_base_additional' ) or $skip_taba = 1;
         can_ok( $class1, 'dbix_class_testcomponent' ) or $skip_tcomp = 1;
         can_ok( $class1, 'loader_test1_classmeth' ) or $skip_cmeth = 1;
+        can_ok( $rsobj1, 'loader_test1_rsmeth' ) or $skip_rsmeth = 1;
 
-        TODO: {
-            local $TODO = "Not yet supported by ResultSetManger code";
-            can_ok( $rsobj1, 'loader_test1_rsmeth' ) or $skip_rsmeth = 1;
-        }
-
         SKIP: {
             skip "Pre-requisite test failed", 1 if $skip_tab;
             is( $class1->test_additional_base, "test_additional_base",