X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/b7cd46a282f4a1a55bfd6168259446acd37e7cf5..3eb3d1b144adb92e62de08e67dc6ff3d39bf7483:/scripts/rose_auto_create_model.pl diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl index 1850f4599..42af25a5b 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,34 +91,66 @@ sub process_table { my $meta_file = "${meta_path}/${package}.pm"; my $file = "SL/DB/${package}.pm"; - $schema = <meta->schema('$schema'); CODE - my $definition = eval <meta->table('$table'); - $schema + $schema_str __PACKAGE__->meta->auto_initialize; - __PACKAGE__->meta->perl_class_definition(indent => 2); # , braces => 'bsd' CODE if ($EVAL_ERROR) { error("Error in execution for table '$table'"); - error("'$EVAL_ERROR'") if $config{verbose}; + error("'$EVAL_ERROR'") unless $config{quiet}; return; } + my %args = (indent => 2, use_setup => 0); + + my $definition = "SL::DB::AUTO::$package"->meta->perl_class_definition(%args); + $definition =~ s/\n+__PACKAGE__->meta->initialize;\n+/\n\n/; $definition =~ s/::AUTO::/::/g; - while (my ($auto_generated_name, $desired_name) = each %{ $foreign_key_name_map{$table} || {} }) { - $definition =~ s/( foreign_keys \s*=> \s*\[ .* ^\s+ ) ${auto_generated_name} \b/${1}${desired_name}/msx; + + # Sort column definitions alphabetically + if ($definition =~ m/__PACKAGE__->meta->columns\( \n (.+?) \n \);/msx) { + my ($start, $end) = ($-[1], $+[1]); + my $sorted_columns = join "\n", sort split m/\n/, $1; + substr $definition, $start, $end - $start, $sorted_columns; } + # patch foreign keys + my $foreign_key_definition = "SL::DB::AUTO::$package"->meta->perl_foreign_keys_definition(%args); + $foreign_key_definition =~ s/::AUTO::/::/g; + + if ($foreign_key_definition && ($definition =~ /\Q$foreign_key_definition\E/)) { + my ($start, $end) = ($-[0], $+[0]); + + while (my ($auto_generated_name, $desired_name) = each %{ $foreign_key_name_map{$table} || {} }) { + $foreign_key_definition =~ s/^ \s \s ${auto_generated_name} \b/ ${desired_name}/msx; + } + + # Sort foreign key definitions alphabetically + if ($foreign_key_definition =~ m/\(\n(.+)\n\)/s) { + my ($list_start, $list_end) = ($-[0], $+[0]); + my @foreign_keys = split m/\n\n/m, $1; + my $sorted_foreign_keys = "(\n" . join("\n\n", sort @foreign_keys) . "\n)"; + + substr $foreign_key_definition, $list_start, $list_end - $list_start, $sorted_foreign_keys;; + } + + substr($definition, $start, $end - $start) = $foreign_key_definition; + } + + $definition =~ s/(meta->table.*)\n/$1\n$schema_str/m if $schema; + my $full_definition = <meta->initialize; + # Creates get_all, get_all_count, get_all_iterator, delete_all and update_all. -$schema __PACKAGE__->meta->make_manager_class; 1; @@ -151,7 +183,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 +210,19 @@ 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; + $options->{color} = -t STDOUT ? 1 : 0; if ($diff) { if (eval { require Text::Diff; 1 }) { @@ -210,7 +243,11 @@ sub show_diff { Text::Diff::diff($text_a, $text_b, { OUTPUT => sub { for (split /\n/, $_[0]) { - print colored($_, $colors{substr($_, 0, 1)}), $/; + if ($config{color}) { + print colored($_, $colors{substr($_, 0, 1)}), $/; + } else { + print $_, $/; + } } }}); } @@ -222,10 +259,10 @@ sub usage { sub make_tables { my @tables; if ($config{all}) { - my $db = SL::DB::create(undef, 'LXOFFICE'); + my $db = SL::DB::create(undef, 'KIVITENDO'); @tables = - map { $package_names{LXOFFICE}->{$_} ? "$_=" . $package_names{LXOFFICE}->{$_} : $_ } - grep { my $table = $_; !any { $_ eq $table } @{ $blacklist{LXOFFICE} } } + map { $package_names{KIVITENDO}->{$_} ? "$_=" . $package_names{KIVITENDO}->{$_} : $_ } + grep { my $table = $_; !any { $_ eq $table } @{ $blacklist{KIVITENDO} } } $db->list_tables; } elsif (@ARGV) { @tables = @ARGV; @@ -251,7 +288,7 @@ my @tables = make_tables(); for my $table (@tables) { # add default model name unless model name is given or no defaults exists - $table .= '=' . $package_names{LXOFFICE}->{lc $table} if $table !~ /=/ && $package_names{LXOFFICE}->{lc $table}; + $table .= '=' . $package_names{KIVITENDO}->{lc $table} if $table !~ /=/ && $package_names{KIVITENDO}->{lc $table}; process_table($table); } @@ -268,11 +305,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 +318,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 +364,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 +393,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