Preserve @_ aliasing semantics on coderefs within try{} blocks

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

diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm
index 366bf25..be90ae1 100644 (file)
--- a/lib/DBIx/Class/Admin.pm
+++ b/lib/DBIx/Class/Admin.pm
@@ -85,16 +85,19 @@ has 'schema' => (
   lazy_build  => 1,
 );
 
+sub BUILD {
+   my $self = shift;
+   require Class::MOP;
+
+   my @include_dirs = @{$self->include_dirs};
+   @INC = (@include_dirs, @INC);
+   Class::MOP::load_class($self->schema_class);
+}
+
 sub _build_schema {
   my ($self)  = @_;
-  require Class::MOP;
-  {
-    my @include_dirs = @{$self->include_dirs};
-    local @INC = (@include_dirs, @INC);
-    Class::MOP::load_class($self->schema_class);
-  }
-  $self->connect_info->[3]->{ignore_version} =1;
-  return $self->schema_class->connect(@{$self->connect_info()} ); # ,  $self->connect_info->[3], { ignore_version => 1} );
+  $self->connect_info->[3]{ignore_version} = 1;
+  return $self->schema_class->connect(@{$self->connect_info});
 }
 
 =head2 include_dirs
@@ -310,8 +313,9 @@ has '_confirm' => (
 
 =back
 
-L<create> will generate sql for the supplied schema_class in sql_dir.  The flavour of sql to
-generate can be controlled by suppling a sqlt_type which should be a L<SQL::Translator> name.
+L<create> will generate sql for the supplied schema_class in sql_dir. The
+flavour of sql to generate can be controlled by supplying a sqlt_type which
+should be a L<SQL::Translator> name.
 
 Arguments for L<SQL::Translator> can be supplied in the sqlt_args hashref.
 
@@ -353,6 +357,7 @@ sub upgrade {
     # schema is unversioned
     $schema->throw_exception ("Could not determin current schema version, please either install() or deploy().\n");
   } else {
+    $schema->upgrade_directory ($self->sql_dir) if $self->sql_dir;  # this will override whatever default the schema has
     my $ret = $schema->upgrade();
     return $ret;
   }