X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/ffa9f969259970df45ea2353a94d1a67e8612731..7cd6d451d97d1f1e7f3c0f9db2de03735dc8c8f0:/SL/DBConnect.pm

diff --git a/SL/DBConnect.pm b/SL/DBConnect.pm
index 369cfe158..9f2472c13 100644
--- a/SL/DBConnect.pm
+++ b/SL/DBConnect.pm
@@ -16,7 +16,6 @@ my %dateformat_to_datestyle = (
 
 sub _connect {
   my ($self, @args) = @_;
-  @args = $self->get_connect_args if !@args;
 
   return DBI->connect(@args) unless $::lx_office_conf{debug} && $::lx_office_conf{debug}->{dbix_log4perl};
 
@@ -33,18 +32,21 @@ sub _connect {
 
 sub connect {
   my ($self, @args) = @_;
+  @args = $self->get_connect_args if !@args;
+  my $initial_sql = $self->get_initial_sql;
 
-  if (my $cached_dbh = SL::DBConnect::Cache->get(@args)) {
+  if (my $cached_dbh = SL::DBConnect::Cache->get(@args, $initial_sql)) {
     return $cached_dbh;
   }
 
   my $dbh = $self->_connect(@args);
   return undef if !$dbh;
 
-  my $initial_sql = $self->get_initial_sql;
-  $dbh->do($initial_sql) if $initial_sql;
-
-  SL::DBConnect::Cache->store($dbh, @args);
+  if ($initial_sql) {
+    $dbh->do($initial_sql);
+    $dbh->commit if !$dbh->{AutoCommit};
+  }
+  SL::DBConnect::Cache->store($dbh, @args, $initial_sql);
 
   return $dbh;
 }