use strict;
use warnings;
-use base qw/Class::Accessor::Grouped/;
-use Scalar::Util qw/weaken blessed/;
+use base qw( DBIx::Class::MethodAttributes Class::Accessor::Grouped );
+
+use Scalar::Util 'blessed';
+use DBIx::Class::_Util 'fail_on_internal_call';
use namespace::clean;
-sub mk_classdata {
+sub mk_classdata :DBIC_method_is_indirect_sugar {
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
shift->mk_classaccessor(@_);
}
-sub mk_classaccessor {
+sub mk_classaccessor :DBIC_method_is_indirect_sugar {
my $self = shift;
$self->mk_group_accessors('inherited', $_[0]);
- $self->set_inherited(@_) if @_ > 1;
+ (@_ > 1)
+ ? $self->set_inherited(@_)
+ : ( DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call )
+ ;
}
-my $successfully_loaded_components;
-
sub get_component_class {
my $class = $_[0]->get_inherited($_[1]);
- # It's already an object, just go for it.
- return $class if blessed $class;
-
- if (defined $class and ! $successfully_loaded_components->{$class} ) {
+ no strict 'refs';
+ if (
+ defined $class
+ and
+ # inherited CAG can't be set to undef effectively, so people may use ''
+ length $class
+ and
+ # It's already an object, just go for it.
+ ! defined blessed $class
+ and
+ ! ${"${class}::__LOADED__BY__DBIC__CAG__COMPONENT_CLASS__"}
+ ) {
$_[0]->ensure_class_loaded($class);
- mro::set_mro( $class, 'c3' );
-
- no strict 'refs';
- $successfully_loaded_components->{$class}
- = ${"${class}::__LOADED__BY__DBIC__CAG__COMPONENT_CLASS__"}
- = do { \(my $anon = 'loaded') };
- weaken($successfully_loaded_components->{$class});
+ ${"${class}::__LOADED__BY__DBIC__CAG__COMPONENT_CLASS__"}
+ = do { \(my $anon = 'loaded') };
}
$class;
};
sub set_component_class {
- shift->set_inherited(@_);
+ $_[0]->set_inherited($_[1], $_[2]);
+
+ # trigger a load for the case of $foo->component_accessor("bar")->new
+ $_[0]->get_component_class($_[1])
+ if defined wantarray;
}
1;