X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Fdbupgrade2_tool.pl;h=7b614a8ec436ae0588ee62d494c1c518d9796fcf;hb=37a9413b839ac18a2cb452601d47c428bf62d03d;hp=f4a7bb7e76ba4aef6a6644e39358f99bbf4e8764;hpb=4780fc8426841be0838551dea12d8329f32ef65e;p=kivitendo-erp.git

diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl
index f4a7bb7e7..7b614a8ec 100755
--- a/scripts/dbupgrade2_tool.pl
+++ b/scripts/dbupgrade2_tool.pl
@@ -2,7 +2,7 @@
 
 BEGIN {
   if (! -d "bin" || ! -d "SL") {
-    print("This tool must be run from the Lx-Office ERP base directory.\n");
+    print("This tool must be run from the kivitendo ERP base directory.\n");
     exit(1);
   }
 
@@ -42,12 +42,23 @@ use SL::Dispatcher;
 #######
 
 my ($opt_list, $opt_tree, $opt_rtree, $opt_nodeps, $opt_graphviz, $opt_help);
-my ($opt_user, $opt_apply, $opt_applied, $opt_unapplied, $opt_format, $opt_test_utf8);
+my ($opt_user, $opt_client, $opt_apply, $opt_applied, $opt_unapplied, $opt_format, $opt_test_utf8);
 my ($opt_dbhost, $opt_dbport, $opt_dbname, $opt_dbuser, $opt_dbpassword, $opt_create, $opt_type);
-my ($opt_description, $opt_encoding, @opt_depends);
+my ($opt_description, $opt_encoding, @opt_depends, $opt_auth_db);
 
 our (%myconfig, $form, $user, $auth, $locale, $controls, $dbupgrader);
 
+sub connect_auth {
+  return $auth if $auth;
+
+  $auth = SL::Auth->new;
+  if (!$auth->session_tables_present) {
+    $form->error("The session and user management tables are not present in the authentication database. Please use the administration web interface to create them.");
+  }
+
+  return $auth;
+}
+
 sub show_help {
   my $help_text = <<"END_HELP"
 dbupgrade2_tool.pl [options]
@@ -73,6 +84,10 @@ dbupgrade2_tool.pl [options]
                          for it\'s option \'-T\' are acceptable.
     --nodeps             List all database upgrades that no other upgrade
                          depends on
+    --create=tag         Creates a new upgrade with the supplied tag. This
+                         action accepts several optional other options. See
+                         the option section for those. After creating the
+                         upgrade file your \$EDITOR will be called with it.
     --apply=tag          Applies the database upgrades \'tag\' and all
                          upgrades it depends on. If \'--apply\' is used
                          then the option \'--user\' must be used as well.
@@ -87,15 +102,31 @@ dbupgrade2_tool.pl [options]
                          and --dbpassword.
     --help               Show this help and exit.
 
-  Options:
+  General Options:
+    --client=id-or-name  The name (or database ID) of the client to use for
+                         database connectivity. You must provide both a client
+                         and a user.
     --user=name          The name of the user configuration to use for
-                         database connectivity.
+                         database connectivity. You must provide both a client
+                         and a user.
+    --auth-db            Work on the authentication database instead of a
+                         user database.
     --dbname=name        Database connection options for the UTF-8
     --dbhost=host        handling test.
     --dbport=port
     --dbuser=user
     --dbpassword=pw
 
+  Options for --create:
+    --type               \'sql\' or \'pl\'. Defaults to sql.
+    --description        The description field of the generated upgrade.
+    --encoding           Encoding used for the file. Defaults to \'utf8\'.
+                         Note: Your editor will not be told to open the file in
+                         this encoding.
+    --depends            Tags of upgrades which this upgrade depends upon.
+                         Defaults to the latest stable release upgrade.
+                         Multiple values possible.
+
 END_HELP
 ;
 
@@ -237,7 +268,7 @@ sub create_upgrade {
 
   my $filename    = $params{filename};
   my $dbupgrader  = $params{dbupgrader};
-  my $type        = $params{type}        || '';
+  my $type        = $params{type}        || 'sql';
   my $description = $params{description} || '';
   my $encoding    = $params{encoding}    || 'utf-8';
   my @depends     = @{ $params{depends} };
@@ -263,13 +294,32 @@ sub create_upgrade {
   die "file '$full_filename' already exists, aborting" if -f $full_filename;
 
 
-  open my $fh, ">:utf8", $full_filename or die "can't open $full_filename";
+  open my $fh, ">:encoding($encoding)", $full_filename or die "can't open $full_filename";
   print $fh "$comment \@tag: $filename\n";
   print $fh "$comment \@description: $description\n";
   print $fh "$comment \@depends: @depends\n";
   print $fh "$comment \@encoding: $encoding\n";
+
+  if ($type eq 'pl') {
+    print $fh "package SL::DBUpgrade2::$filename;\n";
+    print $fh "\n";
+    print $fh "use strict;\n";
+    print $fh "use utf8;\n" if $encoding =~ /utf.?8/i;
+    print $fh "\n";
+    print $fh "use parent qw(SL::DBUpgrade2::Base);\n";
+    print $fh "\n";
+    print $fh "sub run {\n";
+    print $fh "  my (\$self) = \@_;\n";
+    print $fh "\n";
+    print $fh "}\n";
+    print $fh "\n";
+    print $fh "1;\n";
+  }
+
   close $fh;
 
+  print "File $full_filename created.\n";
+
   system("\$EDITOR $full_filename");
   exit 0;
 }
@@ -294,7 +344,8 @@ sub apply_upgrade {
 
   my @upgradescripts = map { $controls->{$_}->{applied} = 0; $controls->{$_} } @order;
 
-  my $dbh = $form->dbconnect_noauto(\%myconfig);
+  my $dbh            = $opt_auth_db ? connect_auth()->dbconnect : $form->dbconnect_noauto(\%myconfig);
+  $dbh->{AutoCommit} = 0;
 
   $dbh->{PrintWarn}  = 0;
   $dbh->{PrintError} = 0;
@@ -323,13 +374,13 @@ 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);
+      $dbupgrader->process_query($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
     } else {
-      $dbupgrader->process_perl_script($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control);
+      $dbupgrader->process_perl_script($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
     }
   }
 
-  $dbh->disconnect();
+  $dbh->disconnect unless $opt_auth_db;
 }
 
 sub dump_sql_result {
@@ -362,7 +413,8 @@ sub dump_sql_result {
 sub dump_applied {
   my @results;
 
-  my $dbh = $form->dbconnect_noauto(\%myconfig);
+  my $dbh            = $opt_auth_db ? connect_auth()->dbconnect : $form->dbconnect_noauto(\%myconfig);
+  $dbh->{AutoCommit} = 0;
 
   $dbh->{PrintWarn}  = 0;
   $dbh->{PrintError} = 0;
@@ -377,7 +429,7 @@ sub dump_applied {
   }
   $sth->finish();
 
-  $dbh->disconnect();
+  $dbh->disconnect unless $opt_auth_db;
 
   if (!scalar @results) {
     print "No database upgrades have been applied yet.\n";
@@ -389,14 +441,14 @@ sub dump_applied {
 sub dump_unapplied {
   my @results;
 
-  my $dbh = $form->dbconnect_noauto(\%myconfig);
+  my $dbh = $opt_auth_db ? connect_auth()->dbconnect : $form->dbconnect_noauto(\%myconfig);
 
   $dbh->{PrintWarn}  = 0;
   $dbh->{PrintError} = 0;
 
   my @unapplied = $dbupgrader->unapplied_upgrade_scripts($dbh);
 
-  $dbh->disconnect;
+  $dbh->disconnect unless $opt_auth_db;
 
   if (!scalar @unapplied) {
     print "All database upgrades have been applied.\n";
@@ -426,8 +478,12 @@ sub build_upgrade_order {
 #######
 #######
 
-$locale = Locale->new;
-$form   = Form->new;
+$locale    = Locale->new;
+$form      = Form->new;
+$::request = SL::Request->new(
+  cgi    => CGI->new({}),
+  layout => SL::Layout::None->new,
+);
 
 #######
 #######
@@ -440,6 +496,7 @@ GetOptions("list"         => \$opt_list,
            "graphviz:s"   => \$opt_graphviz,
            "format:s"     => \$opt_format,
            "user=s"       => \$opt_user,
+           "client=s"     => \$opt_client,
            "apply=s"      => \$opt_apply,
            "applied"      => \$opt_applied,
            "create=s"     => \$opt_create,
@@ -454,12 +511,13 @@ GetOptions("list"         => \$opt_list,
            "dbname:s"     => \$opt_dbname,
            "dbuser:s"     => \$opt_dbuser,
            "dbpassword:s" => \$opt_dbpassword,
+           "auth-db"      => \$opt_auth_db,
            "help"         => \$opt_help,
   );
 
 show_help() if ($opt_help);
 
-$dbupgrader = SL::DBUpgrade2->new(form => $form, dbdriver => 'Pg');
+$dbupgrader = SL::DBUpgrade2->new(form => $form, auth => $opt_auth_db);
 $controls   = $dbupgrader->parse_dbupdate_controls->{all_controls};
 
 dump_list()                                 if ($opt_list);
@@ -475,15 +533,14 @@ create_upgrade(filename   => $opt_create,
                encoding    => $opt_encoding,
                depends     => \@opt_depends) if ($opt_create);
 
+if ($opt_client && !connect_auth()->set_client($opt_client)) {
+  $form->error($form->format_string("The client '#1' does not exist.", $opt_client));
+}
+
 if ($opt_user) {
-  $auth = SL::Auth->new();
-  if (!$auth->session_tables_present()) {
-    $form->error("The session and user management tables are not present in the " .
-                 "authentication database. Please use the administration web interface " .
-                 "and to create them.");
-  }
+  $form->error("Need a client, too.") if !$auth || !$auth->client;
 
-  %myconfig = $auth->read_user(login => $opt_user);
+  %myconfig = connect_auth()->read_user(login => $opt_user);
 
   if (!$myconfig{login}) {
     $form->error($form->format_string("The user '#1' does not exist.", $opt_user));
@@ -496,17 +553,17 @@ if ($opt_user) {
 }
 
 if ($opt_apply) {
-  $form->error("--apply used but no user name given with --user.") if (!$user);
+  $form->error("--apply used but no user name given with --user.") if !$user && !$opt_auth_db;
   apply_upgrade($opt_apply);
 }
 
 if ($opt_applied) {
-  $form->error("--applied used but no user name given with --user.") if (!$user);
+  $form->error("--applied used but no user name given with --user.") if !$user && !$opt_auth_db;
   dump_applied();
 }
 
 if ($opt_unapplied) {
-  $form->error("--unapplied used but no user name given with --user.") if (!$user);
+  $form->error("--unapplied used but no user name given with --user.") if !$user && !$opt_auth_db;
   dump_unapplied();
 }