Revert C3-fication d009cb7d and fixups 7f068248 and 983f766d

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

diff --git a/lib/DBIx/Class/Componentised.pm b/lib/DBIx/Class/Componentised.pm
index 3adea57..b417de6 100644 (file)
--- a/lib/DBIx/Class/Componentised.pm
+++ b/lib/DBIx/Class/Componentised.pm
@@ -13,9 +13,6 @@ use namespace::clean;
 
 # this warns of subtle bugs introduced by UTF8Columns hacky handling of store_column
 # if and only if it is placed before something overriding store_column
-#
-# and also enforces C3 mro on all components
-my $mro_already_set;
 sub inject_base {
   my $class = shift;
   my ($target, @complist) = @_;
@@ -75,12 +72,6 @@ sub inject_base {
     unshift @target_isa, $comp;
   }
 
-  # only examine from $_[2] onwards
-  # C::C3::C already sets c3 on $_[1]
-  mro::set_mro( $_ => 'c3' ) for grep {
-    $mro_already_set->{$_} ? 0 : ( $mro_already_set->{$_} = 1 )
-  } @_[1 .. $#_];
-
   $class->next::method(@_);
 }