Start setting the 'c3' mro unambiguously everywhere

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

diff --git a/lib/DBIx/Class/AccessorGroup.pm b/lib/DBIx/Class/AccessorGroup.pm
index c999a6b..12a8744 100644 (file)
--- a/lib/DBIx/Class/AccessorGroup.pm
+++ b/lib/DBIx/Class/AccessorGroup.pm
@@ -7,6 +7,16 @@ use base qw/Class::Accessor::Grouped/;
 use Scalar::Util qw/weaken blessed/;
 use namespace::clean;
 
+sub mk_classdata {
+  shift->mk_classaccessor(@_);
+}
+
+sub mk_classaccessor {
+  my $self = shift;
+  $self->mk_group_accessors('inherited', $_[0]);
+  $self->set_inherited(@_) if @_ > 1;
+}
+
 my $successfully_loaded_components;
 
 sub get_component_class {
@@ -18,6 +28,8 @@ sub get_component_class {
   if (defined $class and ! $successfully_loaded_components->{$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__"}
@@ -44,13 +56,15 @@ DBIx::Class::AccessorGroup - See Class::Accessor::Grouped
 
 This class now exists in its own right on CPAN as Class::Accessor::Grouped
 
-=head1 AUTHOR AND CONTRIBUTORS
+=head1 FURTHER QUESTIONS?
 
-See L<AUTHOR|DBIx::Class/AUTHOR> and L<CONTRIBUTORS|DBIx::Class/CONTRIBUTORS> in DBIx::Class
+Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.
 
-=head1 LICENSE
+=head1 COPYRIGHT AND LICENSE
 
-You may distribute this code under the same terms as Perl itself.
+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
-