From: Sven Schöling <s.schoeling@linet-services.de>
Date: Fri, 29 Jul 2016 13:50:27 +0000 (+0200)
Subject: DATEV: single-dbh
X-Git-Tag: release-3.5.4~2097
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=040aa711a11c32b18e08f048a4014310bddf074f;p=kivitendo-erp.git

DATEV: single-dbh
---

diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index 9d13e589b..eb23cf284 100644
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -31,6 +31,7 @@ use strict;
 
 use SL::DBUtils;
 use SL::DATEV::KNEFile;
+use SL::DB;
 
 use Data::Dumper;
 use DateTime;
@@ -233,7 +234,7 @@ sub dbh {
     $self->{provided_dbh} = 1;
   }
 
-  $self->{dbh} ||= $::form->get_standard_dbh;
+  $self->{dbh} ||= SL::DB->client->dbh;
 }
 
 sub provided_dbh {
@@ -285,14 +286,14 @@ sub get_datev_stamm {
 sub save_datev_stamm {
   my ($self, $data) = @_;
 
-  do_query($::form, $self->dbh, 'DELETE FROM datev');
+  SL::DB->client->with_transaction(sub {
+    do_query($::form, $self->dbh, 'DELETE FROM datev');
 
-  my @columns = qw(beraternr beratername dfvkz mandantennr datentraegernr abrechnungsnr);
+    my @columns = qw(beraternr beratername dfvkz mandantennr datentraegernr abrechnungsnr);
 
-  my $query = "INSERT INTO datev (" . join(', ', @columns) . ") VALUES (" . join(', ', ('?') x @columns) . ")";
-  do_query($::form, $self->dbh, $query, map { $data->{$_} } @columns);
-
-  $self->dbh->commit unless $self->provided_dbh;
+    my $query = "INSERT INTO datev (" . join(', ', @columns) . ") VALUES (" . join(', ', ('?') x @columns) . ")";
+    do_query($::form, $self->dbh, $query, map { $data->{$_} } @columns);
+  });
 }
 
 sub export {
@@ -1237,6 +1238,10 @@ This is a list of attributes set in either the C<new> or a method of the same na
 Set a database handle to use in the process. This allows for an export to be
 done on a transaction in progress without committing first.
 
+Note: If you don't want this code to commit, simply providing a dbh is not
+enough enymore. You'll have to wrap the call into a transaction yourself, so
+that the internal transaction does not commit.
+
 =item exporttype
 
 See L<CONSTANTS> for possible values. This MUST be set before export is called.