SL::DB::Helper::TransNumberGenerator: immer Lücken füllen

[mfinanz.git] / SL / DB / Helper / CustomVariables.pm

diff --git a/SL/DB/Helper/CustomVariables.pm b/SL/DB/Helper/CustomVariables.pm
index f56e4863e47fd010d9c9f834ee5ff0d584ddb848..373a60cf1cb1e6456cb4967c4ee23fb1a691cdc9 100644 (file)
--- a/SL/DB/Helper/CustomVariables.pm
+++ b/SL/DB/Helper/CustomVariables.pm
@@ -4,7 +4,6 @@ use strict;
 use Carp;
 use Data::Dumper;
 use List::Util qw(first);
 use Carp;
 use Data::Dumper;
 use List::Util qw(first);

-use SL::DB::CustomVariableConfig;

 
 use constant META_CVARS => 'cvars_config';
 
 
 use constant META_CVARS => 'cvars_config';
 


@@ -18,11 +17,11 @@ sub import {
 
   $params{module}     ||= _calc_modules_from_overloads(%params) if $params{overloads};
   $params{sub_module} ||= '';
 
   $params{module}     ||= _calc_modules_from_overloads(%params) if $params{overloads};
   $params{sub_module} ||= '';

-  $params{id}         ||= 'id';
+  $params{id}         ||= _get_primary_key_column($caller_package);

 
   $params{module} || $params{sub_module}  or croak 'need param module or sub_module';
 
 
   $params{module} || $params{sub_module}  or croak 'need param module or sub_module';
 

-  save_meta_info($caller_package, %params);
+  return unless save_meta_info($caller_package, %params);

   make_cvar_accessor($caller_package, %params);
   make_cvar_alias($caller_package, %params)      if $params{cvars_alias};
   make_cvar_by_configs($caller_package, %params);
   make_cvar_accessor($caller_package, %params);
   make_cvar_alias($caller_package, %params)      if $params{cvars_alias};
   make_cvar_by_configs($caller_package, %params);


@@ -36,21 +35,25 @@ sub save_meta_info {
   return 0 if $meta->{META_CVARS()};
 
   $meta->{META_CVARS()} = \%params;
   return 0 if $meta->{META_CVARS()};
 
   $meta->{META_CVARS()} = \%params;

+
+  return 1;

 }
 
 sub make_cvar_accessor {
   my ($caller_package, %params) = @_;
 
 }
 
 sub make_cvar_accessor {
   my ($caller_package, %params) = @_;
 

-  my @module_filter = $params{module} ?
-    ("config.module" => $params{module}) :
+  my $modules = ('ARRAY' eq ref $params{module}) ?
+      join ',', @{ $params{module} } :
+      $params{module};
+  my @module_filter = $modules ?
+    ("config_id" => [ \"(SELECT custom_variable_configs.id FROM custom_variable_configs WHERE custom_variable_configs.module IN ( '$modules' ))" ]) : # " make emacs happy

     ();
 
   $caller_package->meta->add_relationships(
     custom_variables => {
       type         => 'one to many',
       class        => 'SL::DB::CustomVariable',
     ();
 
   $caller_package->meta->add_relationships(
     custom_variables => {
       type         => 'one to many',
       class        => 'SL::DB::CustomVariable',

-      column_map   => { ($params{id} || 'id') => 'trans_id' },
-      manager_args => { with_objects => 'config' },
+      column_map   => { $params{id} => 'trans_id' },

       query_args   => [ sub_module => $params{sub_module}, @module_filter ],
     }
   );
       query_args   => [ sub_module => $params{sub_module}, @module_filter ],
     }
   );


@@ -78,7 +81,19 @@ sub make_cvar_by_configs {
     my $cvars       = $self->custom_variables;
     my %cvars_by_config = map { $_->config_id => $_ } @$cvars;
 
     my $cvars       = $self->custom_variables;
     my %cvars_by_config = map { $_->config_id => $_ } @$cvars;
 

-    my @return  = map { $cvars_by_config{$_->id} || _new_cvar($self, %params, config => $_) } @$configs;
+    my @return = map(
+      {
+        if ( $cvars_by_config{$_->id} ) {
+          $cvars_by_config{$_->id};
+        }
+        else {
+          my $cvar = _new_cvar($self, %params, config => $_);
+          $self->add_custom_variables($cvar);
+          $cvar;
+        }
+      }
+      @$configs
+    );

 
     return \@return;
   }
 
     return \@return;
   }


@@ -112,6 +127,9 @@ sub make_cvar_by_name {
 
 sub _all_configs {
   my (%params) = @_;
 
 sub _all_configs {
   my (%params) = @_;

+
+  require SL::DB::CustomVariableConfig;
+

   $params{module}
     ? SL::DB::Manager::CustomVariableConfig->get_all(query => [ module => $params{module} ])
     : SL::DB::Manager::CustomVariableConfig->get_all;
   $params{module}
     ? SL::DB::Manager::CustomVariableConfig->get_all(query => [ module => $params{module} ])
     : SL::DB::Manager::CustomVariableConfig->get_all;


@@ -120,8 +138,9 @@ sub _all_configs {
 sub _overload_by_module {
   my ($module, %params) = @_;
 
 sub _overload_by_module {
   my ($module, %params) = @_;
 

-  while (my ($fk, $class) = each %{ $params{overloads} }) {
-    return ($fk, $class) if $class->meta->{META_CVARS()}->{module} eq $module;
+  keys %{ $params{overloads} }; # reset each iterator
+  while (my ($fk, $def) = each %{ $params{overloads} }) {
+    return ($fk, $def->{class}) if $def->{module} eq $module;

   }
 
   croak "unknown overload, cannot resolve module $module";
   }
 
   croak "unknown overload, cannot resolve module $module";


@@ -153,16 +172,24 @@ sub _calc_modules_from_overloads {
   my (%params) = @_;
   my %modules;
 
   my (%params) = @_;
   my %modules;
 

-  while (my ($fk, $class) = each %{ $params{overloads} }) {
-    eval "require $class"; # make sure the class is loaded
-    my $module = $class->meta->{META_CVARS()}->{module};
-    next if ref $module;
-    $modules{$module} = 1;
+  for my $def (values %{ $params{overloads} || {} }) {
+    $modules{$def->{module}} = 1;

   }
 
   return [ keys %modules ];
 }
 
   }
 
   return [ keys %modules ];
 }
 

+sub _get_primary_key_column {
+  my ($caller_package) = @_;
+  my $meta             = $caller_package->meta;
+
+  my $column_name;
+  $column_name = $meta->{primary_key}->{columns}->[0] if $meta->{primary_key} && (ref($meta->{primary_key}->{columns}) eq 'ARRAY') && (1 == scalar(@{ $meta->{primary_key}->{columns} }));
+
+  croak "Unable to retrieve primary key column name: meta information for package $caller_package not set up correctly" unless $column_name;
+
+  return $column_name;
+}

 
 1;
 
 
 1;
 


@@ -187,7 +214,10 @@ SL::DB::Helper::CustomVariables - Mixin to provide custom variables relations
     sub_module  => 'orderitems',
     cvars_alias => 1,
     overloads   => {
     sub_module  => 'orderitems',
     cvars_alias => 1,
     overloads   => {

-      parts_id    => 'SL::DB::Part',
+      parts_id    => {
+        class => 'SL::DB::Part',
+        module => 'IC',
+      }

     }
   );
 
     }
   );