X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDBUpgrade2.pm;h=3cdb9a44b9bbce7836e702202ab5303e4a44c03c;hb=49be66cdf74882abde5a93832a959e27baddd925;hp=f6ad6eb182eded4a342fe20e4b1d547390bebc8e;hpb=db797d8fb0431d768c49bf348f00c8fd8b179207;p=kivitendo-erp.git

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index f6ad6eb18..3cdb9a44b 100644
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -243,6 +243,7 @@ sub process_perl_script {
   $dbh->begin_work;
 
   # setup dbup_ export vars & run script
+  my $old_dbh       = $::form->set_standard_dbh($dbh);
   my %dbup_myconfig = map { ($_ => $::form->{$_}) } qw(dbname dbuser dbpasswd dbhost dbport dbconnect);
   my $result        = eval {
     SL::DBUpgrade2::Base::execute_script(
@@ -255,6 +256,8 @@ sub process_perl_script {
 
   my $error = $EVAL_ERROR;
 
+  $::form->set_standard_dbh($old_dbh);
+
   $dbh->rollback if 1 != ($result // -1);
 
   return $error if $self->{return_on_error} && (1 != ($result // -1));
@@ -273,7 +276,7 @@ sub process_perl_script {
     $dbh->do("UPDATE defaults SET version = " . $dbh->quote($version_or_control));
   }
 
-  $dbh->commit if $dbh->{AutoCommit} && $dbh->{BegunWork};
+  $dbh->commit if !$dbh->{AutoCommit} || $dbh->{BegunWork};
 
   # Clear $::form of values that may have been set so that following
   # Perl upgrade scripts won't have to work with old data (think of