X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB.pm;h=861fe6a52835bf8882e4e1185d6c4617c79878c0;hb=b498a3939d86fd9fd7c83e5174103250d8662ca7;hp=18f8696b98263fc0736f196d3a050046a5ef211b;hpb=82515b2d93dc5632f24d6e0b6f8f05f3fd19fbb0;p=kivitendo-erp.git

diff --git a/SL/DB.pm b/SL/DB.pm
index 18f8696b9..861fe6a52 100644
--- a/SL/DB.pm
+++ b/SL/DB.pm
@@ -4,51 +4,128 @@ use strict;
 
 use Carp;
 use Data::Dumper;
+use SL::DBConnect;
 use English qw(-no_match_vars);
 use Rose::DB;
+use Rose::DBx::Cache::Anywhere;
 
 use base qw(Rose::DB);
 
+__PACKAGE__->db_cache_class('Rose::DBx::Cache::Anywhere');
 __PACKAGE__->use_private_registry;
 
 my (%_db_registered, %_initial_sql_executed);
 
+sub dbi_connect {
+  shift;
+
+  return SL::DBConnect->connect(@_);
+}
+
 sub create {
   my $domain = shift || SL::DB->default_domain;
   my $type   = shift || SL::DB->default_type;
 
-  if ($type eq 'LXOFFICE') {
-    $domain = 'LXEMPTY' unless %::myconfig && $::myconfig{dbname};
-    $type   = join $SUBSCRIPT_SEPARATOR, map { $::myconfig{$_} } qw(dbdriver dbname dbhost dbport dbuser dbpasswd) if %::myconfig;
-  }
-
-  _register_db($domain, $type);
+  ($domain, $type) = _register_db($domain, $type);
 
   my $db = __PACKAGE__->new_or_cached(domain => $domain, type => $type);
 
+  _execute_initial_sql($db);
+
   return $db;
 }
 
+my %_dateformats = ( 'yy-mm-dd'   => 'ISO',
+                     'yyyy-mm-dd' => 'ISO',
+                     'mm/dd/yy'   => 'SQL, US',
+                     'mm-dd-yy'   => 'POSTGRES, US',
+                     'dd/mm/yy'   => 'SQL, EUROPEAN',
+                     'dd-mm-yy'   => 'POSTGRES, EUROPEAN',
+                     'dd.mm.yy'   => 'GERMAN'
+                   );
+
 sub _register_db {
   my $domain = shift;
   my $type   = shift;
 
-  my $idx    = "${domain}::${type}";
-  return if $_db_registered{$idx};
-
-  $_db_registered{$idx} = 1;
-
-  __PACKAGE__->register_db(domain          => $domain,
-                           type            => $type,
-                           driver          => $::myconfig{dbdriver} || 'Pg',
-                           database        => $::myconfig{dbname},
-                           host            => $::myconfig{dbhost},
-                           port            => $::myconfig{dbport} || 5432,
-                           username        => $::myconfig{dbuser},
-                           password        => $::myconfig{dbpasswd},
-                           connect_options => { pg_enable_utf8 => $::locale && $::locale->is_utf8,
-                                              },
-                          );
+  my %connect_settings;
+  my $initial_sql;
+
+  if (!%::myconfig) {
+    $type = 'LXOFFICE_EMPTY';
+    %connect_settings = ( driver => 'Pg' );
+
+  } elsif ($type eq 'LXOFFICE_AUTH') {
+    %connect_settings = ( driver          => $::myconfig{dbdriver} || 'Pg',
+                          database        => $::auth->{DB_config}->{db},
+                          host            => $::auth->{DB_config}->{host} || 'localhost',
+                          port            => $::auth->{DB_config}->{port} || 5432,
+                          username        => $::auth->{DB_config}->{user},
+                          password        => $::auth->{DB_config}->{password},
+                          connect_options => { pg_enable_utf8 => $::locale && $::locale->is_utf8,
+                                             });
+  } else {
+    my $european_dates = 0;
+    if ($::myconfig{dateformat}) {
+      $european_dates = 1 if $_dateformats{ $::myconfig{dateformat} }
+                          && $_dateformats{ $::myconfig{dateformat} } =~ m/european/i;
+    }
+
+    %connect_settings = ( driver          => $::myconfig{dbdriver} || 'Pg',
+                          database        => $::myconfig{dbname},
+                          host            => $::myconfig{dbhost} || 'localhost',
+                          port            => $::myconfig{dbport} || 5432,
+                          username        => $::myconfig{dbuser},
+                          password        => $::myconfig{dbpasswd},
+                          connect_options => { pg_enable_utf8 => $::locale && $::locale->is_utf8,
+                                             },
+                          european_dates  => $european_dates);
+  }
+
+  my %flattened_settings = _flatten_settings(%connect_settings);
+
+  $domain = 'LXOFFICE' if $type =~ m/^LXOFFICE/;
+  $type  .= join($SUBSCRIPT_SEPARATOR, map { ($_, $flattened_settings{$_} || '') } sort keys %flattened_settings);
+  my $idx = "${domain}::${type}";
+
+  if (!$_db_registered{$idx}) {
+    $_db_registered{$idx} = 1;
+
+    __PACKAGE__->register_db(domain => $domain,
+                             type   => $type,
+                             %connect_settings,
+                            );
+  }
+
+  return ($domain, $type);
+}
+
+sub _execute_initial_sql {
+  my ($db) = @_;
+
+  return if $_initial_sql_executed{$db} || !%::myconfig || !$::myconfig{dateformat};
+
+  $_initial_sql_executed{$db} = 1;
+
+  # Don't rely on dboptions being set properly. Chose them from
+  # dateformat instead.
+  my $pg_dateformat = $_dateformats{ $::myconfig{dateformat} };
+  $db->dbh->do("set DateStyle to '${pg_dateformat}'") if $pg_dateformat;
+}
+
+sub _flatten_settings {
+  my %settings  = @_;
+  my %flattened = ();
+
+  while (my ($key, $value) = each %settings) {
+    if ('HASH' eq ref $value) {
+      %flattened = ( %flattened, _flatten_settings(%{ $value }) );
+    } else {
+      $flattened{$key} = $value;
+    }
+  }
+
+  return %flattened;
 }
 
 1;