sub dbi_connect {
shift;
- return DBI->connect(@_) unless $::lx_office_conf{debug} && $::lx_office_conf{debug}->{dbix_log4perl};
-
- require Log::Log4perl;
- require DBIx::Log4perl;
-
- my $filename = $LXDebug::file_name;
- my $config = $::lx_office_conf{debug}->{dbix_log4perl_config};
- $config =~ s/LXDEBUGFILE/${filename}/g;
-
- Log::Log4perl->init(\$config);
- return DBIx::Log4perl->connect(@_);
+ 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},
%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}) {