X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FComponentised.pm;h=a82a24786467d91ff2bf409290739a12d212c943;hb=8bfce9d5f3e70af20c9e0786c1c9ccf071696b23;hp=d4a66418dc425e613e0ec89a6f2fedd0ce1520a2;hpb=971c00850836f9d5d731d68fbc8d763e7656fa28;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Componentised.pm b/lib/DBIx/Class/Componentised.pm
index d4a6641..a82a247 100644
--- a/lib/DBIx/Class/Componentised.pm
+++ b/lib/DBIx/Class/Componentised.pm
@@ -1,43 +1,61 @@
-package DBIx::Class::Componentised;
+package # hide from PAUSE
+    DBIx::Class::Componentised;
 
-use Class::C3;
+use strict;
+use warnings;
 
+use base 'Class::C3::Componentised';
+use Carp::Clan qw/^DBIx::Class|^Class::C3::Componentised/;
+use mro 'c3';
+
+# 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
 sub inject_base {
-  my ($class, $target, @to_inject) = @_;
-  {
-    no strict 'refs';
-    unshift(@{"${target}::ISA"}, grep { $target ne $_ && !$target->isa($_)} @to_inject);
-  }
+  my $class = shift;
+  my ($target, @complist) = @_;
 
-  # Yes, this is hack. But it *does* work. Please don't submit tickets about
-  # it on the basis of the comments in Class::C3, the author was on #dbix-class
-  # while I was implementing this.
+  # we already did load the component
+  my $keep_checking = ! $target->isa ('DBIx::Class::UTF8Columns');
 
-  my $table = { Class::C3::_dump_MRO_table };
-  eval "package $target; import Class::C3;" unless exists $table->{$target};
-}
+  my @target_isa = do { no strict 'refs'; @{"$target\::ISA"} };
+  my $base_store_column;
 
-sub load_components {
-  my $class = shift;
-  my $base = $class->component_base_class;
-  my @comp = map { "${base}::$_" } grep { $_ !~ /^#/ } @_;
-  $class->_load_components(@comp);
-  Class::C3::reinitialize();
-}
+  while ($keep_checking && @complist) {
 
-sub load_own_components {
-  my $class = shift;
-  my @comp = map { "${class}::$_" } grep { $_ !~ /^#/ } @_;
-  $class->_load_components(@comp);
-}
+    my $comp = pop @complist;
 
-sub _load_components {
-  my ($class, @comp) = @_;
-  foreach my $comp (@comp) {
-    eval "use $comp";
-    die $@ if $@;
+    if ($comp->isa ('DBIx::Class::UTF8Columns')) {
+
+      $keep_checking = 0;
+
+      $base_store_column ||=
+        do { require DBIx::Class::Row; DBIx::Class::Row->can ('store_column') };
+
+      my @broken;
+      for my $existing_comp (@target_isa) {
+        my $sc = $existing_comp->can ('store_column')
+          or next;
+
+        if ($sc ne $base_store_column) {
+          require B;
+          my $definer = B::svref_2object($sc)->STASH->NAME;
+          push @broken, ($definer eq $existing_comp)
+            ? $existing_comp
+            : "$existing_comp (via $definer)"
+          ;
+        }
+      }
+
+      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 @target_isa, $comp;
   }
-  $class->inject_base($class => @comp);
+
+  $class->next::method(@_);
 }
 
 1;