=cut
use strict;
+use warnings;
use DBI;
-use vars qw($VERSION @EXPORT);
-$VERSION = '1.59';
+our @EXPORT;
+our $VERSION = '1.59';
use constant DRIVERS => {
mysql => 'MySQL',
my $db_user = $args->{'db_user'};
my $db_password = $args->{'db_password'};
+ my $dbh_is_local;
unless ( $dbh ) {
die 'No DSN' unless $dsn;
$dbh = DBI->connect( $dsn, $db_user, $db_password,
RaiseError => 1,
}
);
+ $dbh_is_local = 1;
}
die 'No database handle' unless defined $dbh;
SQL::Translator::load( $pkg );
- eval {
+ my $s = eval {
no strict 'refs';
&{ $sub }( $tr, $dbh ) or die "No result from $pkg";
};
+ my $err = $@;
- $dbh->disconnect if defined $dbh;
+ eval { $dbh->disconnect } if (defined $dbh and $dbh_is_local);
- die $@ if $@;
+ die $err if $err;
- return 1;
+ return $s;
}
1;