push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
}
+
+use strict;
+use warnings;
+
+use utf8;
use English '-no_match_vars';
+use Config::Std;
use DBI;
use Data::Dumper;
use Getopt::Long;
use Text::Iconv;
use SL::LXDebug;
+use SL::LxOfficeConf;
-$lxdebug = LXDebug->new();
+SL::LxOfficeConf->read;
+our $lxdebug = LXDebug->new();
use SL::Auth;
use SL::Form;
use SL::Locale;
use SL::DBUpgrade2;
use SL::DBUtils;
+use SL::Dispatcher;
#######
#######
my ($opt_user, $opt_apply, $opt_applied, $opt_format, $opt_test_utf8);
my ($opt_dbhost, $opt_dbport, $opt_dbname, $opt_dbuser, $opt_dbpassword);
-our (%myconfig, $form, $user, $auth);
+our (%myconfig, $form, $user, $auth, $locale, $controls, $dbupgrader);
sub show_help {
my $help_text = <<"END_HELP"
}
sub dump_list {
- my @sorted_controls = sort_dbupdate_controls($controls);
+ my @sorted_controls = $dbupgrader->sort_dbupdate_controls;
print "LIST VIEW\n\n" .
"number tag depth priority\n";
- $i = 0;
+ my $i = 0;
foreach (@sorted_controls) {
print "$i $_->{tag} $_->{depth} $_->{priority}\n";
$i++;
calc_rev_depends();
- my @sorted_controls = sort_dbupdate_controls($controls);
+ my @sorted_controls = $dbupgrader->sort_dbupdate_controls;
foreach my $control (@sorted_controls) {
dump_node($control->{tag}, "") unless (@{ $control->{rev_depends} });
calc_rev_depends();
- my @sorted_controls = sort_dbupdate_controls($controls);
+ my @sorted_controls = $dbupgrader->sort_dbupdate_controls;
foreach my $control (@sorted_controls) {
last if ($control->{depth} > 1);
calc_rev_depends();
- $dot = "|dot -T${format} ";
+ my $dot = "|dot -T${format} ";
open OUT, "${dot}> \"${file_name}\"" || die;
print OUT
foreach my $c (values %{ $controls }) {
$ranks{$c->{depth}} ||= [];
- my ($pre, $post) = ('node [fillcolor=lightgray] ', 'node [fillcolor=white] ') if (!scalar @{ $c->{rev_depends} });
+ my ($pre, $post) = @{ $c->{rev_depends} } ? ('')x2 :
+ (map "node [fillcolor=$_] ", qw(lightgray white));
push @{ $ranks{$c->{"depth"}} }, qq|${pre}"$c->{tag}"; ${post}|;
}
}
foreach my $c (values %{ $controls }) {
- print OUT "$c->{tag};\n";
+ print OUT qq|"$c->{tag}";\n|;
foreach my $d (@{ $c->{depends} }) {
- print OUT "$c->{tag} -> $d;\n";
+ print OUT qq|"$c->{tag}" -> "$d";\n|;
}
}
$user->create_schema_info_table($form, $dbh);
my $query = qq|SELECT tag FROM schema_info|;
- $sth = $dbh->prepare($query);
+ my $sth = $dbh->prepare($query);
$sth->execute() || $form->dberror($query);
- while (($tag) = $sth->fetchrow_array()) {
+ while (my ($tag) = $sth->fetchrow_array()) {
$controls->{$tag}->{applied} = 1 if defined $controls->{$tag};
}
$sth->finish();
print "Applying upgrade $control->{file}\n";
if ($file_type eq "sql") {
- $user->process_query($form, $dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control);
+ $dbupgrader->process_query($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control);
} else {
- $user->process_perl_script($form, $dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control);
+ $dbupgrader->process_perl_script($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control);
}
}
$user->create_schema_info_table($form, $dbh);
my $query = qq|SELECT tag, login, itime FROM schema_info ORDER BY itime|;
- $sth = $dbh->prepare($query);
+ my $sth = $dbh->prepare($query);
$sth->execute() || $form->dberror($query);
while (my $ref = $sth->fetchrow_hashref()) {
push @results, $ref;
sub build_upgrade_order {
my $name = shift;
my $order = shift;
- my $tag = shift;
+ my $tags = shift;
my $control = $controls->{$name};
foreach my $dependency (@{ $control->{depends} }) {
next if $tags->{$dependency};
$tags->{$dependency} = 1;
- build_upgrade_order($dependency, $order, $tag);
+ build_upgrade_order($dependency, $order, $tags);
}
push @{ $order }, $name;
#######
#######
-eval { require "config/lx-erp.conf"; };
-eval { require "config/lx-erp-local.conf"; } if (-f "config/lx-erp-local.conf");
-
-$form = Form->new();
-$locale = Locale->new("de", "login");
+$locale = Locale->new;
+$form = Form->new;
#######
#######
show_help() if ($opt_help);
-$controls = parse_dbupdate_controls($form, "Pg");
+$dbupgrader = SL::DBUpgrade2->new(form => $form, dbdriver => 'Pg');
+$controls = $dbupgrader->parse_dbupdate_controls->{all_controls};
dump_list() if ($opt_list);
dump_tree() if ($opt_tree);
if ($opt_test_utf8) {
$form->error("--test-utf8 used but no database name given with --dbname.") if (!$opt_dbname);
- my $iconv_to_utf8 = Text::Iconv->new("ISO-8859-15", "UTF-8");
- my $iconv_from_utf8 = Text::Iconv->new("UTF-8", "ISO-8859-15");
-
- my $umlaut_upper = 'Ä';
- my $umlaut_upper_utf8 = $iconv_to_utf8->convert($umlaut_upper);
+ my $umlaut_upper = 'Ä';
my $dbconnect = "dbi:Pg:dbname=${opt_dbname}";
$dbconnect .= ";host=${opt_dbhost}" if ($opt_dbhost);
$dbconnect .= ";port=${opt_dbport}" if ($opt_dbport);
- my $dbh = DBI->connect($dbconnect, $opt_dbuser, $opt_dbpassword);
+ my $dbh = DBI->connect($dbconnect, $opt_dbuser, $opt_dbpassword, { pg_enable_utf8 => 1 });
$form->error("UTF-8 test: Database connect failed (" . $DBI::errstr . ")") if (!$dbh);
- my ($umlaut_lower_utf8) = $dbh->selectrow_array(qq|SELECT lower(?)|, undef, $umlaut_upper_utf8);
+ my ($umlaut_lower) = $dbh->selectrow_array(qq|SELECT lower(?)|, undef, $umlaut_upper);
$dbh->disconnect();
- my $umlaut_lower = $iconv_from_utf8->convert($umlaut_lower_utf8);
-
- if ($umlaut_lower eq 'ä') {
+ if ($umlaut_lower eq 'ä') {
print "UTF-8 test was successful.\n";
- } elsif ($umlaut_lower eq 'Ä') {
+ } elsif ($umlaut_lower eq 'Ä') {
print "UTF-8 test was NOT successful: Umlauts are not modified (this might be partially ok, but you should probably not use UTF-8 on this cluster).\n";
} else {
print "UTF-8 test was NOT successful: Umlauts are destroyed. Do not use UTF-8 on this cluster.\n";
projects / kivitendo-erp.git / blobdiff