X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDBConnect.pm;h=afdf2c9e1b0902cf460016b36f29d6d9d7d61065;hb=576c2a14f72af8f2cfe5679b6c264f13aff39ddf;hp=aeb8719dac1340cc6c8f97e055df77cc975be21b;hpb=16455a4f7a2e871d645485ffb5904d197b907217;p=kivitendo-erp.git

diff --git a/SL/DBConnect.pm b/SL/DBConnect.pm
index aeb8719da..afdf2c9e1 100644
--- a/SL/DBConnect.pm
+++ b/SL/DBConnect.pm
@@ -5,7 +5,15 @@ use strict;
 use DBI;
 use SL::DB;
 
-sub connect {
+my %dateformat_to_datestyle = (
+  'yy-mm-dd'   => 'ISO',
+  'yyyy-mm-dd' => 'ISO',
+  'mm/dd/yy'   => 'SQL, US',
+  'dd/mm/yy'   => 'SQL, EUROPEAN',
+  'dd.mm.yy'   => 'GERMAN'
+);
+
+sub _connect {
   my ($self, @args) = @_;
   @args = $self->get_connect_args if !@args;
 
@@ -22,6 +30,32 @@ sub connect {
   return DBIx::Log4perl->connect(@args);
 }
 
+sub connect {
+  my ($self, @args) = @_;
+
+  my $dbh = $self->_connect(@args);
+  return undef if !$dbh;
+
+  my $initial_sql = $self->get_initial_sql;
+  $dbh->do($initial_sql) if $initial_sql;
+
+  return $dbh;
+}
+
+sub get_datestyle {
+  my ($self, $dateformat) = @_;
+  return $dateformat_to_datestyle{ $dateformat || $::myconfig{dateformat} };
+}
+
+sub get_initial_sql {
+  my ($self) = @_;
+
+  return undef if !%::myconfig || !$::myconfig{dateformat};
+
+  my $datestyle = $self->get_datestyle;
+  return $datestyle ? qq|SET DateStyle to '${datestyle}'| : '';
+}
+
 sub get_connect_args {
   my ($self, @args)   = @_;
   my ($domain, $type) = SL::DB::_register_db(SL::DB->default_domain, 'KIVITENDO');
@@ -97,6 +131,19 @@ C<%options> are optional database options like C<AutoCommit> (fourth
 parameter to L<DBI/connect>). They're merged with default settings by
 filtering them through L/get_options>.
 
+=item C<get_datestyle [$dateformat]>
+
+Returns the appropriate value for the C<SET DateStyle to...> SQL call
+depending on C<$dateformat> (e.g. C<SQL, EUROPEAN> if C<$dateformat>
+equals C<dd.mm.yy>). If C<$dateformat> is not given then it defaults
+to C<$::myconfig{dateformat}>.
+
+=item C<get_initial_sql>
+
+Returns SQL commands that should be executed right after a connection
+has been established. This is usually the call to configure the
+C<DateStyle> format used by the database.
+
 =item C<get_options [%options]>
 
 Returns a hash reference of database options (fourth parameter to