X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FComponentised.pm;h=1bb6a689b476d3fa6f33a4ec51b713370a25559e;hb=57c18b65cf1c7d708efd3717f54fbbc3def07794;hp=109ad360916ba3835c91477cfe44be6e97789c93;hpb=efe6365bc168c25205c527e0e088bd7229a3575b;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Componentised.pm b/lib/DBIx/Class/Componentised.pm
index 109ad36..1bb6a68 100644
--- a/lib/DBIx/Class/Componentised.pm
+++ b/lib/DBIx/Class/Componentised.pm
@@ -6,6 +6,7 @@ use warnings;
 
 use Class::C3;
 use Class::Inspector;
+use Carp::Clan qw/^DBIx::Class/;
 
 sub inject_base {
   my ($class, $target, @to_inject) = @_;
@@ -32,8 +33,7 @@ sub inject_base {
   # 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 {
@@ -64,13 +64,23 @@ 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) = @_;
-  eval "require $f_class";
-  my $err = $@;
-  Class::Inspector->loaded($f_class)
-    or $class->throw_exception($err || "`require $f_class' was successful".
-                                       "but the package is not defined");
+
+  croak "Invalid class name $f_class"
+      if ($f_class=~m/(?:\b:\b|\:{3,})/);
+  return if Class::Inspector->loaded($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