projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Umleitung der Ansprechpersonensuche (im MenĂ¼V3-Header) gefixt
[kivitendo-erp.git]
/
SL
/
DB.pm
diff --git
a/SL/DB.pm
b/SL/DB.pm
index
38441aa
..
dd55163
100644
(file)
--- a/
SL/DB.pm
+++ b/
SL/DB.pm
@@
-4,11
+4,14
@@
use strict;
use Carp;
use Data::Dumper;
use Carp;
use Data::Dumper;
+use SL::DBConnect;
use English qw(-no_match_vars);
use Rose::DB;
use English qw(-no_match_vars);
use Rose::DB;
+use Rose::DBx::Cache::Anywhere;
use base qw(Rose::DB);
use base qw(Rose::DB);
+__PACKAGE__->db_cache_class('Rose::DBx::Cache::Anywhere');
__PACKAGE__->use_private_registry;
my (%_db_registered, %_initial_sql_executed);
__PACKAGE__->use_private_registry;
my (%_db_registered, %_initial_sql_executed);
@@
-23,7
+26,7
@@
sub create {
my $domain = shift || SL::DB->default_domain;
my $type = shift || SL::DB->default_type;
my $domain = shift || SL::DB->default_domain;
my $type = shift || SL::DB->default_type;
-
my
($domain, $type) = _register_db($domain, $type);
+ ($domain, $type) = _register_db($domain, $type);
my $db = __PACKAGE__->new_or_cached(domain => $domain, type => $type);
my $db = __PACKAGE__->new_or_cached(domain => $domain, type => $type);
@@
-35,9
+38,7
@@
sub create {
my %_dateformats = ( 'yy-mm-dd' => 'ISO',
'yyyy-mm-dd' => 'ISO',
'mm/dd/yy' => 'SQL, US',
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' => 'SQL, EUROPEAN',
- 'dd-mm-yy' => 'POSTGRES, EUROPEAN',
'dd.mm.yy' => 'GERMAN'
);
'dd.mm.yy' => 'GERMAN'
);
@@
-64,7
+65,8
@@
sub _register_db {
} else {
my $european_dates = 0;
if ($::myconfig{dateformat}) {
} else {
my $european_dates = 0;
if ($::myconfig{dateformat}) {
- $european_dates = 1 if $_dateformats{ $::myconfig{dateformat} } =~ m/european/i;
+ $european_dates = 1 if $_dateformats{ $::myconfig{dateformat} }
+ && $_dateformats{ $::myconfig{dateformat} } =~ m/european/i;
}
%connect_settings = ( driver => $::myconfig{dbdriver} || 'Pg',
}
%connect_settings = ( driver => $::myconfig{dbdriver} || 'Pg',
@@
-81,7
+83,7
@@
sub _register_db {
my %flattened_settings = _flatten_settings(%connect_settings);
$domain = 'LXOFFICE' if $type =~ m/^LXOFFICE/;
my %flattened_settings = _flatten_settings(%connect_settings);
$domain = 'LXOFFICE' if $type =~ m/^LXOFFICE/;
- $type .= join($SUBSCRIPT_SEPARATOR, map { ($_, $flattened_settings{$_}) } sort keys %flattened_settings);
+ $type .= join($SUBSCRIPT_SEPARATOR, map { ($_, $flattened_settings{$_}
|| ''
) } sort keys %flattened_settings);
my $idx = "${domain}::${type}";
if (!$_db_registered{$idx}) {
my $idx = "${domain}::${type}";
if (!$_db_registered{$idx}) {