From: Moritz Bunkus Date: Thu, 6 Jun 2013 11:24:27 +0000 (+0200) Subject: rose_auto_create_model.pl: Umstellung auf Client; Schema bei Auth* in MetaSetup;... X-Git-Tag: release-3.1.0beta1~331^2~59 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=549dfe12908fd59ca163abf4ddbd61bde3ae406d;p=kivitendo-erp.git rose_auto_create_model.pl: Umstellung auf Client; Schema bei Auth* in MetaSetup; Verbose als Default 1. Umstellung auf Client anstelle von Login. Dafür muss man jetzt "--client name-or-ID" angeben. Analog holt sich das Script den Client aus der Konfiguration devel.client, sofern vorhanden. 2. Schema-Informationen werden nun in die MetaSetup-Dateien geschrieben und nicht mehr in die DB-Klasse. 3. Gesprächigkeit ist nun der Default. Daher ist --verbose weggefallen und wurde durch seinen Komplementär --quiet ersetzt. --- diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default index 382e565a7..f77493c2c 100644 --- a/config/kivitendo.conf.default +++ b/config/kivitendo.conf.default @@ -230,6 +230,14 @@ log_file = /tmp/kivitendo_console_debug.log # autologin to use if none is given login = myxplace_standard +[devel] +# Several settings related to the development of kivitendo. + +# "client" is used by several scripts (e.g. rose_auto_create_model.pl) +# when they need access to the database. It can be either a client's +# database ID or its name. +client = + [debug] # Use DBIx::Log4perl for logging DBI calls. The string LXDEBUGFILE # will be replaced by the file name configured for $::lxdebug. diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl index e935facbd..d2b688684 100755 --- a/scripts/rose_auto_create_model.pl +++ b/scripts/rose_auto_create_model.pl @@ -60,24 +60,23 @@ sub setup { SL::LxOfficeConf->read; - my $login = $config{login} || $::lx_office_conf{devel}{login}; + my $client = $config{client} || $::lx_office_conf{devel}{client}; - if (!$login) { - error("No login found in config. Please provide a login:"); + if (!$client) { + error("No client found in config. Please provide a client:"); usage(); } $::lxdebug = LXDebug->new(); $::locale = Locale->new("de"); $::form = new Form; - $::auth = SL::Auth->new(); - $::user = User->new(login => $login); - %::myconfig = $auth->read_user(login => $login); - $::request = { cgi => CGI->new({}) }; $form->{script} = 'rose_meta_data.pl'; - $form->{login} = $login; + $::auth = SL::Auth->new(); - map { $form->{$_} = $::myconfig{$_} } qw(stylesheet charset); + if (!$::auth->set_client($client)) { + error("No client with ID or name '$client' found in config. Please provide a client:"); + usage(); + } mkdir $meta_path unless -d $meta_path; } @@ -92,7 +91,7 @@ sub process_table { my $meta_file = "${meta_path}/${package}.pm"; my $file = "SL/DB/${package}.pm"; - $schema = <meta->schema('$schema'); CODE @@ -102,7 +101,7 @@ CODE use base qw(SL::DB::Object); __PACKAGE__->meta->table('$table'); - $schema + $schema_str __PACKAGE__->meta->auto_initialize; __PACKAGE__->meta->perl_class_definition(indent => 2); # , braces => 'bsd' @@ -110,7 +109,7 @@ CODE if ($EVAL_ERROR) { error("Error in execution for table '$table'"); - error("'$EVAL_ERROR'") if $config{verbose}; + error("'$EVAL_ERROR'") unless $config{quiet}; return; } @@ -120,6 +119,8 @@ CODE $definition =~ s/( foreign_keys \s*=> \s*\[ .* ^\s+ ) ${auto_generated_name} \b/${1}${desired_name}/msx; } + $definition =~ s/(table\s*=>.*?\n)/$1 schema => '${schema}',\n/ if $schema; + my $full_definition = <meta->make_manager_class; 1; @@ -151,7 +151,7 @@ CODE my $new_size = length $full_definition; my $new_md5 = md5_hex($full_definition); if ($old_size == $new_size && $old_md5 == $new_md5) { - notice("No changes in $meta_file, skipping.") if $config{verbose}; + notice("No changes in $meta_file, skipping.") unless $config{quiet}; return; } @@ -178,18 +178,18 @@ CODE sub parse_args { my ($options) = @_; GetOptions( - 'login|user=s' => \ my $login, + 'client=s' => \ my $client, all => \ my $all, 'no-commit|dry-run' => \ my $nocommit, help => sub { pod2usage(verbose => 99, sections => 'NAME|SYNOPSIS|OPTIONS') }, - verbose => \ my $verbose, + quiet => \ my $quiet, diff => \ my $diff, ); - $options->{login} = $login if $login; + $options->{client} = $client; $options->{all} = $all; $options->{nocommit} = $nocommit; - $options->{verbose} = $verbose; + $options->{quiet} = $quiet; if ($diff) { if (eval { require Text::Diff; 1 }) { @@ -268,11 +268,11 @@ rose_auto_create_model - mana Rose::DB::Object classes for kivitendo =head1 SYNOPSIS - scripts/rose_create_model.pl --login login table1[=package1] [table2[=package2] ...] - scripts/rose_create_model.pl --login login [--all|-a] + scripts/rose_create_model.pl --client name-or-id table1[=package1] [table2[=package2] ...] + scripts/rose_create_model.pl --client name-or-id [--all|-a] # updates all models - scripts/rose_create_model.pl --login login --all + scripts/rose_create_model.pl --client name-or-id --all # updates only customer table, login taken from config scripts/rose_create_model.pl customer @@ -281,7 +281,7 @@ rose_auto_create_model - mana Rose::DB::Object classes for kivitendo scripts/rose_create_model.pl parts=Part # try to update parts, but don't do it. tell what would happen in detail - scripts/rose_create_model.pl --no-commit --verbose parts + scripts/rose_create_model.pl --no-commit parts =head1 DESCRIPTION @@ -327,12 +327,13 @@ created if it does not exist. =over 4 -=item C<--login, -l LOGIN> +=item C<--client, -c CLIENT> -=item C<--user, -u LOGIN> +Provide a client whose database settings are used. If not present the +client is loaded from the config key C. If that too is +not found, an error is thrown. -Provide a login. If not present the login is loaded from the config key -C. If that too is not found, an error is thrown. +Note that C can be either a database ID or a client's name. =item C<--all, -a> @@ -355,10 +356,10 @@ different. Beware, does not imply C<--no-commit>. Print this help. -=item C<--verbose, -v> +=item C<--quiet, -q> -Prints extra information, such as skipped files that were not changed and -errors where the auto initialization failed. +Does not print extra information, such as skipped files that were not +changed and errors where the auto initialization failed. =back