From b49ec094cbc99d74c411255b9ca882bb46e251cb Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 12 Jun 2013 15:42:07 +0200 Subject: [PATCH] dbupgrade2_tool.pl um Mandantenoption erweitert --- scripts/dbupgrade2_tool.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl index 91aac28f6..eb928f63e 100755 --- a/scripts/dbupgrade2_tool.pl +++ b/scripts/dbupgrade2_tool.pl @@ -42,7 +42,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 +103,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 @@ -474,6 +478,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, @@ -510,7 +515,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}) { -- 2.20.1