X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/b49ec094cbc99d74c411255b9ca882bb46e251cb..6dd6719d91cf5a48acb6fb3731f9e143d7a7d83b:/scripts/dbupgrade2_tool.pl diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl index eb928f63e..9b1e9e0d8 100755 --- a/scripts/dbupgrade2_tool.pl +++ b/scripts/dbupgrade2_tool.pl @@ -349,9 +349,6 @@ sub apply_upgrade { 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; @@ -360,9 +357,9 @@ sub apply_upgrade { 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 { - $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); -$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);