[Bast-commits] r5836 - DBIx-Class/0.08/trunk/lib/DBIx/Class

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-03-29 11:06:02 +0100 (Sun, 29 Mar 2009)
New Revision: 5836

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Schema.pm
Log:
Revert r5808 - this is NOT a bug, the warning IS correct

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Schema.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Schema.pm	2009-03-29 08:49:32 UTC (rev 5835)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Schema.pm	2009-03-29 10:06:02 UTC (rev 5836)
@@ -1221,9 +1221,7 @@
 
 sub register_class {
   my ($self, $moniker, $to_register) = @_;
-  $self->register_source($moniker => $to_register->result_source_instance, {
-    _to_register => $to_register
-  });
+  $self->register_source($moniker => $to_register->result_source_instance);
 }
 
 =head2 register_source
@@ -1281,11 +1279,7 @@
 
   if ($source->result_class) {
     my %map = %{$self->class_mappings};
-    my $is_subof = $params->{_to_register} && UNIVERSAL::isa(
-        $params->{_to_register},
-        $source->result_class
-    );
-    if (exists $map{$source->result_class} && !$is_subof) {
+    if (exists $map{$source->result_class}) {
       warn $source->result_class . ' already has a source, use register_extra_source for additional sources';
     }
     $map{$source->result_class} = $moniker;