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;
- my ($domain, $type) = _register_db($domain, $type);
+ ($domain, $type) = _register_db($domain, $type);
my $db = __PACKAGE__->new_or_cached(domain => $domain, type => $type);
} elsif ($type eq 'LXOFFICE_AUTH') {
%connect_settings = ( driver => $::myconfig{dbdriver} || 'Pg',
database => $::auth->{DB_config}->{db},
- host => $::auth->{DB_config}->{host},
+ host => $::auth->{DB_config}->{host} || 'localhost',
port => $::auth->{DB_config}->{port} || 5432,
username => $::auth->{DB_config}->{user},
password => $::auth->{DB_config}->{password},
} 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',
database => $::myconfig{dbname},
- host => $::myconfig{dbhost},
+ host => $::myconfig{dbhost} || 'localhost',
port => $::myconfig{dbport} || 5432,
username => $::myconfig{dbuser},
password => $::myconfig{dbpasswd},
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}) {