WebshopApi: File upload Übersetzungen

[kivitendo-erp.git] / scripts / dbupgrade2_tool.pl

diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl
index 91aac28..04c024e 100755 (executable)
--- a/scripts/dbupgrade2_tool.pl
+++ b/scripts/dbupgrade2_tool.pl
@@ -1,16 +1,13 @@
 #!/usr/bin/perl
 
 BEGIN {
-  if (! -d "bin" || ! -d "SL") {
-    print("This tool must be run from the kivitendo ERP base directory.\n");
-    exit(1);
-  }
+  use FindBin;
 
-  unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
-  push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+  unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
+  push   (@INC, $FindBin::Bin . '/..');
+  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
 }
 
-
 use strict;
 use warnings;
 
@@ -42,7 +39,7 @@ 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, $opt_auth_db);
 
@@ -103,8 +100,12 @@ dbupgrade2_tool.pl [options]
     --help               Show this help and exit.
 
   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
@@ -295,6 +296,23 @@ sub create_upgrade {
   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";
@@ -345,9 +363,6 @@ sub apply_upgrade {
     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;
@@ -356,9 +371,9 @@ 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, $db_charset);
+      $dbupgrader->process_query($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
     } else {
-      $dbupgrader->process_perl_script($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control, $db_charset);
+      $dbupgrader->process_perl_script($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
     }
   }
 
@@ -460,8 +475,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,
+);
 
 #######
 #######
@@ -474,6 +493,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,
@@ -494,7 +514,7 @@ GetOptions("list"         => \$opt_list,
 
 show_help() if ($opt_help);
 
-$dbupgrader = SL::DBUpgrade2->new(form => $form, dbdriver => 'Pg', auth => $opt_auth_db);
+$dbupgrader = SL::DBUpgrade2->new(form => $form, auth => $opt_auth_db);
 $controls   = $dbupgrader->parse_dbupdate_controls->{all_controls};
 
 dump_list()                                 if ($opt_list);
@@ -510,7 +530,13 @@ 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) {
+  $form->error("Need a client, too.") if !$auth || !$auth->client;
+
   %myconfig = connect_auth()->read_user(login => $opt_user);
 
   if (!$myconfig{login}) {