Merge 'trunk' into 'dbicadmin-non-versioned'

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Admin.pm

diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm
index ab8309d..b43e23b 100644 (file)
--- a/lib/DBIx/Class/Admin.pm
+++ b/lib/DBIx/Class/Admin.pm
@@ -89,7 +89,10 @@ sub _build_schema {
   my ($self)  = @_;
   require Class::MOP;
   {
-    local @INC = (@{$self->include_dirs}, @INC);
+    my @include_dirs = @{$self->include_dirs};
+    $self->_debug("Adding to \@INC:\n".join "\n",@include_dirs)
+        if $self->debug;
+    local @INC = (@include_dirs, @INC);
     Class::MOP::load_class($self->schema_class);
   }
   $self->connect_info->[3]->{ignore_version} =1;
@@ -222,8 +225,8 @@ has config => (
 sub _build_config {
   my ($self) = @_;
 
-  eval { require Config::Any }
-    or die ("Config::Any is required to parse the config file.\n");
+  try { require Config::Any }
+    catch { die ("Config::Any is required to parse the config file.\n") };
 
   my $cfg = Config::Any->load_files ( {files => [$self->config_file], use_ext =>1, flatten_to_hash=>1});
 
@@ -293,6 +296,20 @@ has quiet => (
   isa => Bool,
 );
 
+=head2 debug
+
+Print debug information
+
+=cut
+
+has debug => (
+  is => 'rw',
+  isa => Bool,
+  default => 0
+);
+
+sub _debug { shift; print @_ }
+
 has '_confirm' => (
   is  => 'bare',
   isa => Bool,