X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FComponentised.pm;h=fb0bd2890dddd259c75a3a23f25528e2e09bd892;hb=b1d8e3fd4c2fc5cbfa48b1fd62318760112d35ab;hp=f83bd220b248181d0c99677a96315b03dfc63941;hpb=147dd158cf91465b8a48adce738d56b85f7d1b9b;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Componentised.pm b/lib/DBIx/Class/Componentised.pm
index f83bd22..fb0bd28 100644
--- a/lib/DBIx/Class/Componentised.pm
+++ b/lib/DBIx/Class/Componentised.pm
@@ -1,35 +1,48 @@
-package DBIx::Class::Componentised;
+package # hide from PAUSE
+    DBIx::Class::Componentised;
 
-use Class::C3;
+use strict;
+use warnings;
 
-sub inject_base {
-  my ($class, $target, @to_inject) = @_;
-  {
-    no strict 'refs';
-    unshift(@{"${target}::ISA"}, grep { $target ne $_ } @to_inject);
-  }
-  eval "package $target; use Class::C3;";
-}
+use base 'Class::C3::Componentised';
+use Carp::Clan qw/^DBIx::Class|^Class::C3::Componentised/;
+use mro 'c3';
 
-sub load_components {
+# this warns of subtle bugs introduced by UTF8Columns hacky handling of store_column
+sub inject_base {
   my $class = shift;
-  my @comp = map { "DBIx::Class::$_" } grep { $_ !~ /^#/ } @_;
-  $class->_load_components(@comp);
-}
+  my $target = shift;
 
-sub load_own_components {
-  my $class = shift;
-  my @comp = map { "${class}::$_" } grep { $_ !~ /^#/ } @_;
-  $class->_load_components(@comp);
-}
+  my @present_components = (@{mro::get_linear_isa ($target)||[]});
+  shift @present_components;    # don't need to interrogate myself
 
-sub _load_components {
-  my ($class, @comp) = @_;
-  foreach my $comp (@comp) {
-    eval "use $comp";
-    die $@ if $@;
+  no strict 'refs';
+  for my $comp (reverse @_) {
+
+    # if we are trying add a UTF8Columns component *for the first time*
+    if ($comp->isa ('DBIx::Class::UTF8Columns') && ! $target->isa ('DBIx::Class::UTF8Columns') ) {
+      require B;
+      my @broken;
+
+      for (@present_components) {
+        last if $_ eq 'DBIx::Class::Row'; # don't care about anything further down the chain
+
+        my $cref = $_->can ('store_column')
+         or next;
+
+        push @broken, $_ if B::svref_2object($cref)->STASH->NAME eq $_;
+      }
+
+      carp "Incorrect loading order of $comp by ${target} will affect other components overriding store_column ("
+          . join (', ', @broken)
+          .'). Refer to the documentation of DBIx::Class::UTF8Columns for more info'
+       if @broken;
+    }
+
+    unshift @present_components, $comp;
   }
-  $class->inject_base($class => @comp);
+
+  $class->next::method($target, @_);
 }
 
 1;