use Class::C3;
use Class::Inspector;
+use Carp::Clan qw/^DBIx::Class/;
sub inject_base {
my ($class, $target, @to_inject) = @_;
# it on the basis of the comments in Class::C3, the author was on #dbix-class
# while I was implementing this.
- my $table = { Class::C3::_dump_MRO_table };
- eval "package $target; import Class::C3;" unless exists $table->{$target};
+ eval "package $target; import Class::C3;" unless exists $Class::C3::MRO{$target};
}
sub load_components {
#
# TODO: handle ->has_many('rel', 'Class'...) instead of
# ->has_many('rel', 'Some::Schema::Class'...)
+#
+# BUG: For some reason, packages with syntax errors are added to %INC on
+# require
sub ensure_class_loaded {
my ($class, $f_class) = @_;
+
+ croak "Invalid class name $f_class"
+ if ($f_class=~m/(?:\b:\b|\:{3,})/);
return if Class::Inspector->loaded($f_class);
- require $f_class;
+ eval "require $f_class"; # require needs a bareword or filename
+ if ($@) {
+ if ($class->can('throw_exception')) {
+ $class->throw_exception($@);
+ } else {
+ croak $@;
+ }
+ }
}
# Returns true if the specified class is installed or already loaded, false