projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SL::DB::{Chart,Part}: Verwendung von $::request->cache()
[kivitendo-erp.git]
/
SL
/
DBUpgrade2.pm
diff --git
a/SL/DBUpgrade2.pm
b/SL/DBUpgrade2.pm
index
f6ad6eb
..
6502583
100644
(file)
--- a/
SL/DBUpgrade2.pm
+++ b/
SL/DBUpgrade2.pm
@@
-238,11
+238,12
@@
sub process_perl_script {
my ($self, $dbh, $filename, $version_or_control) = @_;
my ($self, $dbh, $filename, $version_or_control) = @_;
- my %form_values = map { $_ => $::form->{$_} } qw(dbconnect dbdefault dbhost db
mbkiviunstable db
name dboptions dbpasswd dbport dbupdate dbuser login template_object version);
+ my %form_values = map { $_ => $::form->{$_} } qw(dbconnect dbdefault dbhost dbname dboptions dbpasswd dbport dbupdate dbuser login template_object version);
$dbh->begin_work;
# setup dbup_ export vars & run 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(
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;
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));
$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->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
# 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