X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=024a683db72d09f7dbf0e742ee7908a6ea400674;hb=5547891f42ef3b13d477eba65bb0537ece1d703c;hp=ec09687054a4aafc704b6536b0a9b37e9ebe7ed5;hpb=0b6cb3b882036db18ce9c283bfaebe3bc483507e;p=kivitendo-erp.git

diff --git a/SL/User.pm b/SL/User.pm
index ec0968705..024a683db 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -121,19 +121,16 @@ sub login {
 
     $self->create_schema_info_table($form, $dbh);
 
-    $dbh->disconnect;
-
     $rc = 0;
 
-    my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $myconfig{dbdriver});
-    my $controls  = $dbupdater->parse_dbupdate_controls;
+    my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $myconfig{dbdriver})->parse_dbupdate_controls;
 
-    map({ $form->{$_} = $myconfig{$_} }
-        qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect dateformat));
-
-    if (update_available($myconfig{"dbdriver"}, $dbversion) ||
-        update2_available($form, $controls)) {
+    map({ $form->{$_} = $myconfig{$_} } qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect dateformat));
+    dbconnect_vars($form, $form->{dbname});
+    my $update_available = $dbupdater->update_available($dbversion) || $dbupdater->update2_available($dbh);
+    $dbh->disconnect;
 
+    if ($update_available) {
       $form->{"stylesheet"} = "lx-office-erp.css";
       $form->{"title"} = $main::locale->text("Dataset upgrade");
       $form->header();
@@ -164,6 +161,7 @@ sub login {
 
       $self->dbupdate($form);
       $self->dbupdate2($form, $dbupdater);
+      SL::DBUpgrade2->new(form => $::form, dbdriver => 'Pg', auth => 1)->apply_admin_dbupgrade_scripts(0);
 
       close(FH);
 
@@ -180,7 +178,6 @@ sub login {
       print $form->parse_html_template("dbupgrade/footer", { "menufile" => $menufile });
 
       $rc = -2;
-
     }
   }
 
@@ -456,8 +453,8 @@ sub dbneedsupdate {
 
   my ($self, $form) = @_;
 
-  my %members  = $main::auth->read_all_users();
-  my $controls = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver})->parse_dbupdate_controls;
+  my %members   = $main::auth->read_all_users();
+  my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver})->parse_dbupdate_controls;
 
   my ($query, $sth, %dbs_needing_updates);
 
@@ -479,11 +476,13 @@ sub dbneedsupdate {
       ($version) = $sth->fetchrow_array();
     }
     $sth->finish();
-    $dbh->disconnect();
 
-    next unless $version;
+    $dbh->disconnect and next unless $version;
+
+    my $update_available = $dbupdater->update_available($version) || $dbupdater->update2_available($dbh);
+    $dbh->disconnect;
 
-    if (update_available($form->{dbdriver}, $version) || update2_available($form, $controls)) {
+   if ($update_available) {
       my $dbinfo = {};
       map { $dbinfo->{$_} = $member->{$_} } grep /^db/, keys %{ $member };
       $dbs_needing_updates{$member->{dbhost} . "::" . $member->{dbname}} = $dbinfo;
@@ -537,18 +536,6 @@ sub cmp_script_version {
   return $res_a <=> $res_b;
 }
 
-sub update_available {
-  my ($dbdriver, $cur_version) = @_;
-
-  local *SQLDIR;
-
-  opendir SQLDIR, "sql/${dbdriver}-upgrade" || error("", "sql/${dbdriver}-upgrade: $!");
-  my @upgradescripts = grep /${dbdriver}-upgrade-\Q$cur_version\E.*\.(sql|pl)$/, readdir SQLDIR;
-  closedir SQLDIR;
-
-  return ($#upgradescripts > -1);
-}
-
 sub create_schema_info_table {
   $main::lxdebug->enter_sub();
 
@@ -660,59 +647,29 @@ sub dbupdate2 {
 
   $form->{sid} = $form->{dbdefault};
 
-  my @upgradescripts = ();
-  my ($query, $sth, $tag);
-  my $rc = -2;
+  my $rc         = -2;
+  my $db_charset = $main::dbcharset || Common::DEFAULT_CHARSET;
 
-  @upgradescripts = $dbupdater->sort_dbupdate_controls;
-
-  my $db_charset = $main::dbcharset;
-  $db_charset ||= Common::DEFAULT_CHARSET;
+  map { $_->{description} = SL::Iconv::convert($_->{charset}, $db_charset, $_->{description}) } values %{ $dbupdater->{all_controls} };
 
   foreach my $db (split / /, $form->{dbupdate}) {
-
     next unless $form->{$db};
 
     # strip db from dataset
     $db =~ s/^db//;
     &dbconnect_vars($form, $db);
 
-    my $dbh =
-      DBI->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd})
-      or $form->dberror;
+    my $dbh = DBI->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) or $form->dberror;
 
     $dbh->do($form->{dboptions}) if ($form->{dboptions});
 
-    map({ $_->{"applied"} = 0; } @upgradescripts);
-
     $self->create_schema_info_table($form, $dbh);
 
-    $query = qq|SELECT tag FROM schema_info|;
-    $sth = $dbh->prepare($query);
-    $sth->execute() || $form->dberror($query);
-    while (($tag) = $sth->fetchrow_array()) {
-      $dbupdater->{all_controls}->{$tag}->{"applied"} = 1 if (defined($dbupdater->{all_controls}->{$tag}));
-    }
-    $sth->finish();
-
-    my $all_applied = 1;
-    foreach (@upgradescripts) {
-      if (!$_->{"applied"}) {
-        $all_applied = 0;
-        last;
-      }
-    }
+    my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh);
 
-    next if ($all_applied);
+    $dbh->disconnect and next if !@upgradescripts;
 
     foreach my $control (@upgradescripts) {
-      next if ($control->{"applied"});
-
-      $control->{description} = SL::Iconv::convert($control->{charset}, $db_charset, $control->{description});
-
-      $control->{"file"} =~ /\.(sql|pl)$/;
-      my $file_type = $1;
-
       # apply upgrade
       $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
       print $form->parse_html_template("dbupgrade/upgrade_message2", $control);
@@ -730,38 +687,6 @@ sub dbupdate2 {
   return $rc;
 }
 
-sub update2_available {
-  $main::lxdebug->enter_sub();
-
-  my ($form, $controls) = @_;
-
-  map({ $_->{"applied"} = 0; } values(%{$controls}));
-
-  dbconnect_vars($form, $form->{"dbname"});
-
-  my $dbh =
-    DBI->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) ||
-    $form->dberror;
-
-  my ($query, $tag, $sth);
-
-  $query = qq|SELECT tag FROM schema_info|;
-  $sth = $dbh->prepare($query);
-  if ($sth->execute()) {
-    while (($tag) = $sth->fetchrow_array()) {
-      $controls->{$tag}->{"applied"} = 1 if (defined($controls->{$tag}));
-    }
-  }
-  $sth->finish();
-  $dbh->disconnect();
-
-  map({ $main::lxdebug->leave_sub() and return 1 if (!$_->{"applied"}) }
-      values(%{$controls}));
-
-  $main::lxdebug->leave_sub();
-  return 0;
-}
-
 sub save_member {
   $main::lxdebug->enter_sub();