-package DBIx::Class::MethodAttributes;
+package DBIx::Class::ResultSetManager;
use strict;
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');
-
-sub base_resultset_class {
- my ($self,$class) = @_;
- $self->result_source_instance->resultset_class($class);
-}
+__PACKAGE__->mk_classdata($_) for 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;
+ $self->_register_resultset_class;
}
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;
+ return unless $self->can('_attr_cache');
+
my $cache = $self->_attr_cache;
foreach my $meth (@{Class::Inspector->methods($self) || []}) {
my $attrs = $cache->{$self->can($meth)};
undef *{"$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;
}
+sub _register_resultset_class {
+ my $self = shift;
+ my $resultset_class = $self . $self->table_resultset_class_suffix;
+ no strict 'refs';
+ if (@{"$resultset_class\::ISA"}) {
+ $self->result_source_instance->resultset_class($resultset_class);
+ } else {
+ $self->result_source_instance->resultset_class($self->base_resultset_class);
+ }
+}
+
1;
\ No newline at end of file