projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "./scripts/installation_check.pl"
[kivitendo-erp.git]
/
scripts
/
dbupgrade2_tool.pl
diff --git
a/scripts/dbupgrade2_tool.pl
b/scripts/dbupgrade2_tool.pl
index
eb928f6
..
9b1e9e0
100755
(executable)
--- a/
scripts/dbupgrade2_tool.pl
+++ b/
scripts/dbupgrade2_tool.pl
@@
-349,9
+349,6
@@
sub apply_upgrade {
exit 0;
}
exit 0;
}
- my $db_charset = $::lx_office_conf{system}->{dbcharset};
- $db_charset ||= Common::DEFAULT_CHARSET();
-
foreach my $control (@upgradescripts) {
$control->{file} =~ /\.(sql|pl)$/;
my $file_type = $1;
foreach my $control (@upgradescripts) {
$control->{file} =~ /\.(sql|pl)$/;
my $file_type = $1;
@@
-360,9
+357,9
@@
sub apply_upgrade {
print "Applying upgrade $control->{file}\n";
if ($file_type eq "sql") {
print "Applying upgrade $control->{file}\n";
if ($file_type eq "sql") {
- $dbupgrader->process_query($dbh, "sql/
$form->{dbdriver}-upgrade2/$control->{file}", $control, $db_charset
);
+ $dbupgrader->process_query($dbh, "sql/
Pg-upgrade2/$control->{file}", $control
);
} else {
} else {
- $dbupgrader->process_perl_script($dbh, "sql/
$form->{dbdriver}-upgrade2/$control->{file}", $control, $db_charset
);
+ $dbupgrader->process_perl_script($dbh, "sql/
Pg-upgrade2/$control->{file}", $control
);
}
}
}
}
@@
-499,7
+496,7
@@
GetOptions("list" => \$opt_list,
show_help() if ($opt_help);
show_help() if ($opt_help);
-$dbupgrader = SL::DBUpgrade2->new(form => $form,
dbdriver => 'Pg',
auth => $opt_auth_db);
+$dbupgrader = SL::DBUpgrade2->new(form => $form, auth => $opt_auth_db);
$controls = $dbupgrader->parse_dbupdate_controls->{all_controls};
dump_list() if ($opt_list);
$controls = $dbupgrader->parse_dbupdate_controls->{all_controls};
dump_list() if ($opt_list);