projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ZUGFeRD: Feature über Mandantenkonfiguration abschaltbar
[kivitendo-erp.git]
/
scripts
/
dbupgrade2_tool.pl
diff --git
a/scripts/dbupgrade2_tool.pl
b/scripts/dbupgrade2_tool.pl
index
d5b5ebb
..
77c9cb7
100755
(executable)
--- a/
scripts/dbupgrade2_tool.pl
+++ b/
scripts/dbupgrade2_tool.pl
@@
-5,7
+5,6
@@
BEGIN {
unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
push (@INC, $FindBin::Bin . '/..');
unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
push (@INC, $FindBin::Bin . '/..');
- push (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
}
use strict;
}
use strict;
@@
-338,8
+337,7
@@
sub apply_upgrade {
my @upgradescripts = map { $controls->{$_}->{applied} = 0; $controls->{$_} } @order;
my @upgradescripts = map { $controls->{$_}->{applied} = 0; $controls->{$_} } @order;
- my $dbh = $opt_auth_db ? connect_auth()->dbconnect : $form->dbconnect_noauto(\%myconfig);
- $dbh->{AutoCommit} = 0;
+ my $dbh = $opt_auth_db ? connect_auth()->dbconnect : SL::DB->client->dbh;
$dbh->{PrintWarn} = 0;
$dbh->{PrintError} = 0;
$dbh->{PrintWarn} = 0;
$dbh->{PrintError} = 0;
@@
-366,12
+364,7
@@
sub apply_upgrade {
# apply upgrade
print "Applying upgrade $control->{file}\n";
# apply upgrade
print "Applying upgrade $control->{file}\n";
-
- if ($file_type eq "sql") {
- $dbupgrader->process_query($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
- } else {
- $dbupgrader->process_perl_script($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
- }
+ $dbupgrader->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
}
$dbh->disconnect unless $opt_auth_db;
}
$dbh->disconnect unless $opt_auth_db;
@@
-407,7
+400,7
@@
sub dump_sql_result {
sub dump_applied {
my @results;
sub dump_applied {
my @results;
- my $dbh = $opt_auth_db ? connect_auth()->dbconnect :
$form->dbconnect_noauto(\%myconfig)
;
+ my $dbh = $opt_auth_db ? connect_auth()->dbconnect :
SL::DB->client->dbh
;
$dbh->{AutoCommit} = 0;
$dbh->{PrintWarn} = 0;
$dbh->{AutoCommit} = 0;
$dbh->{PrintWarn} = 0;
@@
-435,7
+428,7
@@
sub dump_applied {
sub dump_unapplied {
my @results;
sub dump_unapplied {
my @results;
- my $dbh = $opt_auth_db ? connect_auth()->dbconnect :
$form->dbconnect_noauto(\%myconfig)
;
+ my $dbh = $opt_auth_db ? connect_auth()->dbconnect :
SL::DB->client->dbh
;
$dbh->{PrintWarn} = 0;
$dbh->{PrintError} = 0;
$dbh->{PrintWarn} = 0;
$dbh->{PrintError} = 0;