Audit and minimize use of last major indirect method: search()

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

diff --git a/lib/DBIx/Class/ResultSetManager.pm b/lib/DBIx/Class/ResultSetManager.pm
index 754bce2..e4adae5 100644 (file)
--- a/lib/DBIx/Class/ResultSetManager.pm
+++ b/lib/DBIx/Class/ResultSetManager.pm
@@ -1,21 +1,47 @@
 package DBIx::Class::ResultSetManager;
 use strict;
+use warnings;
 use base 'DBIx::Class';
-use Class::Inspector;
 
-__PACKAGE__->mk_classdata($_) for qw/ _attr_cache custom_resultset_class_suffix /;
-__PACKAGE__->_attr_cache({});
-__PACKAGE__->custom_resultset_class_suffix('::_rs');
+use DBIx::Class::_Util qw( set_subname describe_class_methods );
+use namespace::clean;
 
-sub base_resultset_class {
-    my ($self,$class) = @_;
-    $self->result_source_instance->resultset_class($class);
-}
+warn "DBIx::Class::ResultSetManager never left experimental status and
+has now been DEPRECATED. This module will be deleted in 09000 so please
+migrate any and all code using it to explicit resultset classes using either
+__PACKAGE__->resultset_class(...) calls or by switching from using
+DBIx::Class::Schema->load_classes() to load_namespaces() and creating
+appropriate My::Schema::ResultSet::* classes for it to pick up.";
+
+=head1 NAME
+
+DBIx::Class::ResultSetManager - scheduled for deletion in 09000
+
+=head1 DESCRIPTION
+
+DBIx::Class::ResultSetManager never left experimental status and
+has now been DEPRECATED. This module will be deleted in 09000 so please
+migrate any and all code using it to explicit resultset classes using either
+__PACKAGE__->resultset_class(...) calls or by switching from using
+DBIx::Class::Schema->load_classes() to load_namespaces() and creating
+appropriate My::Schema::ResultSet::* classes for it to pick up.";
+
+=cut
+
+__PACKAGE__->mk_group_accessors(inherited => qw(
+  base_resultset_class table_resultset_class_suffix
+));
+__PACKAGE__->base_resultset_class('DBIx::Class::ResultSet');
+__PACKAGE__->table_resultset_class_suffix('::_resultset');
 
 sub table {
     my ($self,@rest) = @_;
-    $self->next::method(@rest);
-    $self->_register_attributes;
+    my $ret = $self->next::method(@rest);
+    if (@rest) {
+        $self->_register_attributes;
+        $self->_register_resultset_class;
+    }
+    return $ret;
 }
 
 sub load_resultset_components {
@@ -24,37 +50,62 @@ sub load_resultset_components {
     $resultset_class->load_components(@comp);
 }
 
-sub MODIFY_CODE_ATTRIBUTES {
-    my ($class,$code,@attrs) = @_;
-    $class->_attr_cache({ %{$class->_attr_cache}, $code => [@attrs] });
-    return ();
-}
-
 sub _register_attributes {
     my $self = shift;
     my $cache = $self->_attr_cache;
-    foreach my $meth (@{Class::Inspector->methods($self) || []}) {
-        my $attrs = $cache->{$self->can($meth)};
-        next unless $attrs;
-        if ($attrs->[0] eq 'resultset') {
-            no strict 'refs';
-            my $resultset_class = $self->_setup_resultset_class;
-            *{"$resultset_class\::$meth"} = *{"$self\::$meth"};
-            undef *{"$self\::$meth"};
-        }
+    return if keys %$cache == 0;
+
+    for my $meth(
+      map
+        { $_->{name} }
+        grep
+          { $_->{attributes}{ResultSet} }
+          map
+            { $_->[0] }
+            values %{ describe_class_methods( ref $self || $self )->{methods} }
+    ) {
+        # This codepath is extremely old, miht as well keep it running
+        # as-is with no room for surprises
+        no strict 'refs';
+        my $resultset_class = $self->_setup_resultset_class;
+        my $name = join '::',$resultset_class, $meth;
+        *$name = set_subname $name, $self->can($meth);
+        delete ${"${self}::"}{$meth};
     }
-    $self->_attr_cache(undef);
 }
 
 sub _setup_resultset_class {
     my $self = shift;
-    my $resultset_class = $self . $self->custom_resultset_class_suffix;
+    my $resultset_class = $self . $self->table_resultset_class_suffix;
     no strict 'refs';
     unless (@{"$resultset_class\::ISA"}) {
-        @{"$resultset_class\::ISA"} = ($self->result_source_instance->resultset_class);
-        $self->result_source_instance->resultset_class($resultset_class);        
+        @{"$resultset_class\::ISA"} = ($self->base_resultset_class);
     }
     return $resultset_class;
 }
 
-1;
\ No newline at end of file
+sub _register_resultset_class {
+    my $self = shift;
+    my $resultset_class = $self . $self->table_resultset_class_suffix;
+    no strict 'refs';
+    $self->result_source->resultset_class(
+      ( scalar @{"${resultset_class}::ISA"} )
+        ? $resultset_class
+        : $self->base_resultset_class
+    );
+}
+
+=head1 FURTHER QUESTIONS?
+
+Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.
+
+=head1 COPYRIGHT AND LICENSE
+
+This module is free software L<copyright|DBIx::Class/COPYRIGHT AND LICENSE>
+by the L<DBIx::Class (DBIC) authors|DBIx::Class/AUTHORS>. You can
+redistribute it and/or modify it under the same terms as the
+L<DBIx::Class library|DBIx::Class/COPYRIGHT AND LICENSE>.
+
+=cut
+
+1;