[Bast-commits] r5252 - in DBIx-Class/0.08/branches/rt_bug_41083: lib/DBIx/Class t t/lib/DBICNSTest/RtBug41083/ResultSet t/lib/DBICNSTest/RtBug41083/ResultSet_A

[jmmills at dev.catalyst.perl.org]

Author: jmmills
Date: 2008-12-17 06:13:07 +0000 (Wed, 17 Dec 2008)
New Revision: 5252

Modified:
   DBIx-Class/0.08/branches/rt_bug_41083/lib/DBIx/Class/Schema.pm
   DBIx-Class/0.08/branches/rt_bug_41083/t/39load_namespaces_rt41083.t
   DBIx-Class/0.08/branches/rt_bug_41083/t/lib/DBICNSTest/RtBug41083/ResultSet/Foo.pm
   DBIx-Class/0.08/branches/rt_bug_41083/t/lib/DBICNSTest/RtBug41083/ResultSet_A/A.pm
Log:
A simple fix to the warning generated by a sub-classed proxy - Please verify.



Modified: DBIx-Class/0.08/branches/rt_bug_41083/lib/DBIx/Class/Schema.pm
===================================================================
--- DBIx-Class/0.08/branches/rt_bug_41083/lib/DBIx/Class/Schema.pm	2008-12-16 23:45:51 UTC (rev 5251)
+++ DBIx-Class/0.08/branches/rt_bug_41083/lib/DBIx/Class/Schema.pm	2008-12-17 06:13:07 UTC (rev 5252)
@@ -208,6 +208,7 @@
     local *Class::C3::reinitialize = sub { };
     use warnings 'redefine';
 
+    my %done;
     foreach my $result (keys %results) {
       my $result_class = $results{$result};
       $class->ensure_class_loaded($result_class);
@@ -215,8 +216,9 @@
 
       my $rs_class = delete $resultsets{$result};
       my $rs_set = $result_class->resultset_class;
+      $done{$rs_set} = $rs_set unless exists $done{$rs_set};
       if($rs_set && $rs_set ne 'DBIx::Class::ResultSet') {
-        if($rs_class && $rs_class ne $rs_set) {
+        if($rs_class && !exists($done{$rs_set}) && $rs_class ne $rs_set) {
           warn "We found ResultSet class '$rs_class' for '$result', but it seems "
              . "that you had already set '$result' to use '$rs_set' instead";
         }

Modified: DBIx-Class/0.08/branches/rt_bug_41083/t/39load_namespaces_rt41083.t
===================================================================
--- DBIx-Class/0.08/branches/rt_bug_41083/t/39load_namespaces_rt41083.t	2008-12-16 23:45:51 UTC (rev 5251)
+++ DBIx-Class/0.08/branches/rt_bug_41083/t/39load_namespaces_rt41083.t	2008-12-17 06:13:07 UTC (rev 5252)
@@ -6,7 +6,7 @@
 
 use lib 't/lib';
 
-plan tests => 2;
+plan tests => 4;
 
 sub _chk_warning {
 	defined $_[0]? 
@@ -26,7 +26,7 @@
     );
 };
 ok(!$@) or diag $@;
-ok(_chk_warning($warnings), 'Works here');
+ok(_chk_warning($warnings), 'expected no complaint');
 
 eval {
     local $SIG{__WARN__} = sub { $warnings .= shift };
@@ -39,4 +39,4 @@
     );
 };
 ok(!$@) or diag $@;
-ok(_chk_warning($warnings), 'Fails here');
+ok(_chk_warning($warnings), 'expected no complaint') or diag $warnings;

Modified: DBIx-Class/0.08/branches/rt_bug_41083/t/lib/DBICNSTest/RtBug41083/ResultSet/Foo.pm
===================================================================
--- DBIx-Class/0.08/branches/rt_bug_41083/t/lib/DBICNSTest/RtBug41083/ResultSet/Foo.pm	2008-12-16 23:45:51 UTC (rev 5251)
+++ DBIx-Class/0.08/branches/rt_bug_41083/t/lib/DBICNSTest/RtBug41083/ResultSet/Foo.pm	2008-12-17 06:13:07 UTC (rev 5252)
@@ -2,4 +2,7 @@
 use strict;
 use warnings;
 use base 'DBICNSTest::RtBug41083::ResultSet';
+
+sub fooBar { 1; }
+
 1;

Modified: DBIx-Class/0.08/branches/rt_bug_41083/t/lib/DBICNSTest/RtBug41083/ResultSet_A/A.pm
===================================================================
--- DBIx-Class/0.08/branches/rt_bug_41083/t/lib/DBICNSTest/RtBug41083/ResultSet_A/A.pm	2008-12-16 23:45:51 UTC (rev 5251)
+++ DBIx-Class/0.08/branches/rt_bug_41083/t/lib/DBICNSTest/RtBug41083/ResultSet_A/A.pm	2008-12-17 06:13:07 UTC (rev 5252)
@@ -2,4 +2,6 @@
 use strict;
 use warnings;
 use base 'DBICNSTest::RtBug41083::ResultSet';
+
+sub fooBar { 1; }
 1;