projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
53cbf0d
)
DBUpgrade: temporäre dbh Behandlung
author
Sven Schöling
<s.schoeling@linet-services.de>
Tue, 16 Aug 2016 11:21:10 +0000
(13:21 +0200)
committer
Sven Schöling
<s.schoeling@linet-services.de>
Fri, 2 Sep 2016 12:21:30 +0000
(14:21 +0200)
SL/DBUpgrade2.pm
patch
|
blob
|
history
diff --git
a/SL/DBUpgrade2.pm
b/SL/DBUpgrade2.pm
index
753783c
..
ede8501
100644
(file)
--- a/
SL/DBUpgrade2.pm
+++ b/
SL/DBUpgrade2.pm
@@
-243,7
+243,8
@@
sub process_perl_script {
$dbh->begin_work;
# setup dbup_ export vars & run script
- my $old_dbh = SL::DB->client->dbh($dbh);
+ my $old_dbh = SL::DB->client->dbh;
+ SL::DB->client->dbh($dbh);
my %dbup_myconfig = map { ($_ => $::form->{$_}) } qw(dbname dbuser dbpasswd dbhost dbport dbconnect);
my $result = eval {
SL::DBUpgrade2::Base::execute_script(
@@
-256,7
+257,7
@@
sub process_perl_script {
my $error = $EVAL_ERROR;
-
$::form->set_standard_
dbh($old_dbh);
+
SL::DB->client->
dbh($old_dbh);
$dbh->rollback if 1 != ($result // -1);