projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #34 from kivitendo/warengruppen_pflichtfeld
[kivitendo-erp.git]
/
SL
/
DBConnect.pm
diff --git
a/SL/DBConnect.pm
b/SL/DBConnect.pm
index
4ee4873
..
9fcf7f4
100644
(file)
--- a/
SL/DBConnect.pm
+++ b/
SL/DBConnect.pm
@@
-16,7
+16,6
@@
my %dateformat_to_datestyle = (
sub _connect {
my ($self, @args) = @_;
sub _connect {
my ($self, @args) = @_;
- @args = $self->get_connect_args if !@args;
return DBI->connect(@args) unless $::lx_office_conf{debug} && $::lx_office_conf{debug}->{dbix_log4perl};
return DBI->connect(@args) unless $::lx_office_conf{debug} && $::lx_office_conf{debug}->{dbix_log4perl};
@@
-33,6
+32,7
@@
sub _connect {
sub connect {
my ($self, @args) = @_;
sub connect {
my ($self, @args) = @_;
+ @args = $self->get_connect_args if !@args;
my $initial_sql = $self->get_initial_sql;
if (my $cached_dbh = SL::DBConnect::Cache->get(@args, $initial_sql)) {
my $initial_sql = $self->get_initial_sql;
if (my $cached_dbh = SL::DBConnect::Cache->get(@args, $initial_sql)) {
@@
-119,7
+119,7
@@
optionally routing through DBIx::Log4perl
Connects to the database. If the configuration parameter
C<debug.dbix_log4perl> is set then the call is made through
Connects to the database. If the configuration parameter
C<debug.dbix_log4perl> is set then the call is made through
-L<DBIx::Log4per/connect>. Otherwise L<DBI/connect> is called directly.
+L<DBIx::Log4per
l
/connect>. Otherwise L<DBI/connect> is called directly.
In each case C<@dbi_args> is passed through as-is.
In each case C<@dbi_args> is passed through as-is.