use warnings;
use base 'Class::C3::Componentised';
-use Carp::Clan qw/^DBIx::Class|^Class::C3::Componentised/;
use mro 'c3';
+use DBIx::Class::Carp '^DBIx::Class|^Class::C3::Componentised';
+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) = @_;
# we already did load the component
- my $keep_checking = ! $target->isa ('DBIx::Class::UTF8Columns');
+ my $keep_checking = ! (
+ $target->isa ('DBIx::Class::UTF8Columns')
+ ||
+ $target->isa ('DBIx::Class::ForceUTF8')
+ );
- my @target_isa = do { no strict 'refs'; @{"$target\::ISA"} };
- my $base_store_column;
+ my @target_isa;
while ($keep_checking && @complist) {
+ @target_isa = do { no strict 'refs'; @{"$target\::ISA"} }
+ unless @target_isa;
+
my $comp = pop @complist;
- if ($comp->isa ('DBIx::Class::UTF8Columns')) {
+ # warn here on use of either component, as we have no access to ForceUTF8,
+ # the author does not respond, and the Catalyst wiki used to recommend it
+ for (qw/DBIx::Class::UTF8Columns DBIx::Class::ForceUTF8/) {
+ if ($comp->isa ($_) ) {
+ $keep_checking = 0; # no use to check from this point on
+ carp_once "Use of $_ is strongly discouraged. See documentation of DBIx::Class::UTF8Columns for more info\n"
+ unless $ENV{DBIC_UTF8COLUMNS_OK};
+ last;
+ }
+ }
- $keep_checking = 0;
+ # something unset $keep_checking - we got a unicode mangler
+ if (! $keep_checking) {
- $base_store_column ||=
- do { require DBIx::Class::Row; DBIx::Class::Row->can ('store_column') };
+ my $base_store_column = do { require DBIx::Class::Row; DBIx::Class::Row->can ('store_column') };
my @broken;
for my $existing_comp (@target_isa) {
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(@_);
}