projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
scripts
/
dbupgrade2_tool.pl
diff --git
a/scripts/dbupgrade2_tool.pl
b/scripts/dbupgrade2_tool.pl
index
3b9faf9
..
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/Pg-upgrade2/$control->{file}", $control
, $db_charset
);
+ $dbupgrader->process_query($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
} else {
} else {
- $dbupgrader->process_perl_script($dbh, "sql/Pg-upgrade2/$control->{file}", $control
, $db_charset
);
+ $dbupgrader->process_perl_script($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
}
}
}
}