X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FObject.pm;h=8b86e97111a9942d2b0e422a30026d9557f571ff;hb=937e37ad007405c6a3a389ee18006379ffecc073;hp=a80640cadadddbac6917e4dc3a5ba613f42a3d15;hpb=1df2efffbb760f0c7ad5e32e40807beadc227b80;p=kivitendo-erp.git

diff --git a/SL/DB/Object.pm b/SL/DB/Object.pm
index a80640cad..8b86e9711 100755
--- a/SL/DB/Object.pm
+++ b/SL/DB/Object.pm
@@ -2,6 +2,7 @@ package SL::DB::Object;
 
 use strict;
 
+use English qw(-no_match_vars);
 use Rose::DB::Object;
 use List::MoreUtils qw(any);
 
@@ -59,6 +60,15 @@ sub _assign_attributes {
 
   my %types      = map { $_->name => $_->type } ref($self)->meta->columns;
 
+  # Special case for *_as_man_days / *_as_man_days_string /
+  # *_as_man_days_unit: the _unit variation must always be called
+  # after the non-unit methods.
+  my @man_days_attributes = grep { m/_as_man_days(?:_string)?$/ } keys %attributes;
+  foreach my $attribute (@man_days_attributes) {
+    my $value = delete $attributes{$attribute};
+    $self->$attribute(defined($value) && ($value eq '') ? undef : $value);
+  }
+
   while (my ($attribute, $value) = each %attributes) {
     my $type = lc($types{$attribute} || 'text');
     $value   = $type eq 'boolean'                ? ($value ? 't' : 'f')
@@ -95,6 +105,17 @@ sub call_sub_if {
   return $check ? $self->$sub(@_) : $self;
 }
 
+sub get_first_conflicting {
+  my ($self, @attributes) = @_;
+
+  my $primary_key         = ($self->meta->primary_key)[0];
+  my @where               = map { ($_ => $self->$_) } @attributes;
+
+  push @where, ("!$primary_key" => $self->$primary_key) if $self->$primary_key;
+
+  return $self->_get_manager_class->get_first(where => [ and => \@where ]);
+}
+
 # These three functions cannot sit in SL::DB::Object::Hooks because
 # mixins don't deal well with super classes (SUPER is the current
 # package's super class, not $self's).
@@ -111,28 +132,44 @@ sub load {
 sub save {
   my ($self, @args) = @_;
 
-  my $result;
+  my ($result, $exception);
   my $worker = sub {
-    SL::DB::Object::Hooks::run_hooks($self, 'before_save');
-    $result = $self->SUPER::save(@args);
-    SL::DB::Object::Hooks::run_hooks($self, 'after_save', $result);
+    $exception = $EVAL_ERROR unless eval {
+      SL::DB::Object::Hooks::run_hooks($self, 'before_save');
+      $result = $self->SUPER::save(@args);
+      SL::DB::Object::Hooks::run_hooks($self, 'after_save', $result);
+      1;
+    };
+
+    return $result;
   };
 
   $self->db->in_transaction ? $worker->() : $self->db->do_transaction($worker);
+
+  die $exception if $exception;
+
   return $result;
 }
 
 sub delete {
   my ($self, @args) = @_;
 
-  my $result;
+  my ($result, $exception);
   my $worker = sub {
-    SL::DB::Object::Hooks::run_hooks($self, 'before_delete');
-    $result = $self->SUPER::delete(@args);
-    SL::DB::Object::Hooks::run_hooks($self, 'after_delete', $result);
+    $exception = $EVAL_ERROR unless eval {
+      SL::DB::Object::Hooks::run_hooks($self, 'before_delete');
+      $result = $self->SUPER::delete(@args);
+      SL::DB::Object::Hooks::run_hooks($self, 'after_delete', $result);
+      1;
+    };
+
+    return $result;
   };
 
   $self->db->in_transaction ? $worker->() : $self->db->do_transaction($worker);
+
+  die $exception if $exception;
+
   return $result;
 }
 
@@ -207,6 +244,13 @@ whether or not C<$name> is called.
 Returns the sub's result if the check is positive and C<$self>
 otherwise.
 
+=item C<get_first_conflicting @attributes>
+
+Returns the first object for which all properties listed in
+C<@attributes> equal those in C<$self> but which is not C<$self>. Can
+be used to check whether or not an object's columns are unique before
+saving or during validation.
+
 =back
 
 =head1 AUTHOR