X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Fdbupgrade2_tool.pl;h=97e8e3f77e86a8734fe1088d9d4dbc354fc7f790;hb=9b04d60be8bb52438345e8f809057bca2f4dd4a4;hp=bef04f0dd6753433e27852808fd941feda32c538;hpb=c7edb24800396748f2bf1e40ff05f90a18d31b02;p=kivitendo-erp.git

diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl
index bef04f0dd..97e8e3f77 100755
--- a/scripts/dbupgrade2_tool.pl
+++ b/scripts/dbupgrade2_tool.pl
@@ -10,16 +10,24 @@ BEGIN {
   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;
@@ -27,6 +35,7 @@ use SL::User;
 use SL::Locale;
 use SL::DBUpgrade2;
 use SL::DBUtils;
+use SL::Dispatcher;
 
 #######
 #######
@@ -36,7 +45,7 @@ my ($opt_list, $opt_tree, $opt_rtree, $opt_nodeps, $opt_graphviz, $opt_help);
 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"
@@ -103,12 +112,12 @@ sub calc_rev_depends {
 }
 
 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++;
@@ -132,7 +141,7 @@ sub dump_tree {
 
   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} });
@@ -156,7 +165,7 @@ sub dump_tree_reverse {
 
   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);
@@ -177,7 +186,7 @@ sub dump_graphviz {
 
   calc_rev_depends();
 
-  $dot = "|dot -T${format} ";
+  my $dot = "|dot -T${format} ";
   open OUT, "${dot}> \"${file_name}\"" || die;
 
   print OUT
@@ -189,7 +198,8 @@ sub dump_graphviz {
   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}|;
   }
@@ -199,10 +209,10 @@ sub dump_graphviz {
   }
 
   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|;
     }
   }
 
@@ -246,9 +256,9 @@ sub apply_upgrade {
   $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();
@@ -267,9 +277,9 @@ sub apply_upgrade {
     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);
     }
   }
 
@@ -314,7 +324,7 @@ sub dump_applied {
   $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;
@@ -333,14 +343,14 @@ sub dump_applied {
 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;
@@ -351,11 +361,8 @@ sub build_upgrade_order {
 #######
 #######
 
-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");
+$locale = Locale->new;
+$form   = Form->new;
 
 #######
 #######
@@ -381,7 +388,8 @@ GetOptions("list"         => \$opt_list,
 
 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);
@@ -423,29 +431,23 @@ if ($opt_applied) {
 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";