X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Frose_auto_create_model.pl;h=bb246f86f82b9a79dd62c465ef0a36434e1b07f5;hb=0cb0a30142224785c73b545b6729b1d5b8892fca;hp=d2b6886849746b98aee266d7e4b3a7e4e8a66c68;hpb=549dfe12908fd59ca163abf4ddbd61bde3ae406d;p=kivitendo-erp.git diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl index d2b688684..bb246f86f 100755 --- a/scripts/rose_auto_create_model.pl +++ b/scripts/rose_auto_create_model.pl @@ -13,7 +13,7 @@ use Data::Dumper; use Digest::MD5 qw(md5_hex); use English qw( -no_match_vars ); use Getopt::Long; -use List::MoreUtils qw(any); +use List::MoreUtils qw(none); use Pod::Usage; use Term::ANSIColor; @@ -40,7 +40,8 @@ $script =~ s:.*/::; $OUTPUT_AUTOFLUSH = 1; $Data::Dumper::Sortkeys = 1; -our $meta_path = "SL/DB/MetaSetup"; +our $meta_path = "SL/DB/MetaSetup"; +our $manager_path = "SL/DB/Manager"; my %config; @@ -52,6 +53,7 @@ our %foreign_key_name_map = ( orderitems => { parts => 'part', trans => 'order', }, delivery_order_items => { parts => 'part' }, invoice => { parts => 'part' }, + follow_ups => { 'employee_obj' => 'created_for' }, periodic_invoices_configs => { oe => 'order' }, ); @@ -78,24 +80,27 @@ sub setup { usage(); } - mkdir $meta_path unless -d $meta_path; + foreach (($meta_path, $manager_path)) { + mkdir $_ unless -d; + } } sub process_table { - my @spec = split(/=/, shift, 2); + my @spec = @_; my $table = $spec[0]; my $schema = ''; ($schema, $table) = split(m/\./, $table) if $table =~ m/\./; my $package = ucfirst($spec[1] || $spec[0]); $package =~ s/_+(.)/uc($1)/ge; my $meta_file = "${meta_path}/${package}.pm"; + my $mngr_file = "${manager_path}/${package}.pm"; my $file = "SL/DB/${package}.pm"; my $schema_str = $schema ? <meta->schema('$schema'); CODE - my $definition = eval <meta->auto_initialize; - __PACKAGE__->meta->perl_class_definition(indent => 2); # , braces => 'bsd' CODE if ($EVAL_ERROR) { @@ -113,13 +117,44 @@ CODE 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; } - $definition =~ s/(table\s*=>.*?\n)/$1 schema => '${schema}',\n/ if $schema; + # 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->make_manager_class; +__PACKAGE__->meta->initialize; 1; CODE @@ -165,14 +200,39 @@ CODE notice("File '$meta_file' " . ($file_exists ? 'updated' : 'created') . " for table '$table'"); - if (! -f $file) { - if (!$config{nocommit}) { - open my $out, ">", $file || die; - print $out $meta_definition; - } + return if -f $file; - notice("File '$file' created as well."); + if (!$config{nocommit}) { + open my $out, ">", $file || die; + print $out $meta_definition; } + + notice("File '$file' created as well."); + + return if -f $mngr_file; + + if (!$config{nocommit}) { + open my $out, ">", $mngr_file || die; + print $out <make_manager_methods; + +1; +EOT + } + + notice("File '$mngr_file' created as well."); } sub parse_args { @@ -190,6 +250,7 @@ sub parse_args { $options->{all} = $all; $options->{nocommit} = $nocommit; $options->{quiet} = $quiet; + $options->{color} = -t STDOUT ? 1 : 0; if ($diff) { if (eval { require Text::Diff; 1 }) { @@ -210,7 +271,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 $_, $/; + } } }}); } @@ -223,10 +288,8 @@ sub make_tables { my @tables; if ($config{all}) { my $db = SL::DB::create(undef, 'KIVITENDO'); - @tables = - map { $package_names{KIVITENDO}->{$_} ? "$_=" . $package_names{KIVITENDO}->{$_} : $_ } - grep { my $table = $_; !any { $_ eq $table } @{ $blacklist{KIVITENDO} } } - $db->list_tables; + @tables = grep { my $table = $_; none { $_ eq $table } @{ $blacklist{KIVITENDO} } } $db->list_tables; + } elsif (@ARGV) { @tables = @ARGV; } else { @@ -249,13 +312,14 @@ parse_args(\%config); setup(); my @tables = make_tables(); -for my $table (@tables) { - # add default model name unless model name is given or no defaults exists - $table .= '=' . $package_names{KIVITENDO}->{lc $table} if $table !~ /=/ && $package_names{KIVITENDO}->{lc $table}; - - process_table($table); +my @unknown_tables = grep { !$package_names{KIVITENDO}->{$_} } @tables; +if (@unknown_tables) { + error("The following tables do not have entries in \%SL::DB::Helper::Mappings::kivitendo_package_names: " . join(' ', sort @unknown_tables)); + exit 1; } +process_table($_, $package_names{KIVITENDO}->{$_}) for @tables; + 1; __END__ @@ -268,7 +332,7 @@ rose_auto_create_model - mana Rose::DB::Object classes for kivitendo =head1 SYNOPSIS - scripts/rose_create_model.pl --client name-or-id table1[=package1] [table2[=package2] ...] + scripts/rose_create_model.pl --client name-or-id table1 [table2 ...] scripts/rose_create_model.pl --client name-or-id [--all|-a] # updates all models @@ -318,10 +382,11 @@ In the most basic version, just give it a login and a table name, and it will load the schema information for this table and create the appropriate class files, or update them if already present. -Each table has two associated files. A C class, which is -a perl version of the schema definition, and a C class file. The -first one will be updated if the schema changes, the second one will only be -created if it does not exist. +Each table has three associated files. A C +class, which is a perl version of the schema definition, a +C class file and a C manager class +file. The first one will be updated if the schema changes, the second +and third ones will only be created if it they do not exist. =head1 OPTIONS @@ -369,6 +434,7 @@ None yet. =head1 AUTHOR +Moritz Bunkus Em.bunkus@linet-services.deE, Sven Schöling Es.schoeling@linet-services.deE =cut