0.05999_01 shipped

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / ResultSetManager.pm

diff --git a/lib/DBIx/Class/ResultSetManager.pm b/lib/DBIx/Class/ResultSetManager.pm
index c3ab98d..c2af0f2 100644 (file)
--- a/lib/DBIx/Class/ResultSetManager.pm
+++ b/lib/DBIx/Class/ResultSetManager.pm
@@ -9,9 +9,12 @@ __PACKAGE__->table_resultset_class_suffix('::_resultset');
 
 sub table {
     my ($self,@rest) = @_;
-    $self->next::method(@rest);
-    $self->_register_attributes;
-    $self->_register_resultset_class;
+    my $ret = $self->next::method(@rest);
+    if (@rest) {
+        $self->_register_attributes;
+        $self->_register_resultset_class;        
+    }
+    return $ret;
 }
 
 sub load_resultset_components {
@@ -31,8 +34,8 @@ sub _register_attributes {
         if ($attrs->[0] eq 'ResultSet') {
             no strict 'refs';
             my $resultset_class = $self->_setup_resultset_class;
-            *{"$resultset_class\::$meth"} = *{"$self\::$meth"};
-            undef *{"$self\::$meth"};
+            *{"$resultset_class\::$meth"} = $self->can($meth);
+            delete ${"${self}::"}{$meth};
         }
     }
 }
@@ -73,7 +76,7 @@ __END__
     __PACKAGE__->load_resultset_components(qw/AlwaysRS/);
     
     # will be removed from the table class and inserted into a table-specific resultset class
-    sub foo : resultset { ... }
+    sub foo : ResultSet { ... }
 
 =head1 DESCRIPTION