X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB.pm;h=f12584754b2cb005177a0aec04199980528274ab;hb=3a8e5bda9aeca9faf1a5278bc14324104d4db5c8;hp=5a22c5da52ecaaff388f697b0c3f30b129b96fc8;hpb=2b96805c82afc5fa9f7678815ef6d537dd5cfed6;p=kivitendo-erp.git diff --git a/SL/DB.pm b/SL/DB.pm index 5a22c5da5..f12584754 100644 --- a/SL/DB.pm +++ b/SL/DB.pm @@ -4,7 +4,6 @@ use strict; use Carp; use Data::Dumper; -use SL::DBConnect; use English qw(-no_match_vars); use Rose::DB; use Rose::DBx::Cache::Anywhere; @@ -14,11 +13,13 @@ use base qw(Rose::DB); __PACKAGE__->db_cache_class('Rose::DBx::Cache::Anywhere'); __PACKAGE__->use_private_registry; -my (%_db_registered, %_initial_sql_executed); +my (%_db_registered); sub dbi_connect { shift; + # runtime require to break circular include + require SL::DBConnect; return SL::DBConnect->connect(@_); } @@ -30,61 +31,69 @@ sub create { 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', - 'dd/mm/yy' => 'SQL, EUROPEAN', - 'dd.mm.yy' => 'GERMAN' - ); +sub client { + create(undef, 'KIVITENDO'); +} + +sub auth { + create(undef, 'KIVITENDO_AUTH'); +} sub _register_db { my $domain = shift; my $type = shift; - 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; - } + require SL::DBConnect; + my %specific_connect_settings; + my %common_connect_settings = ( + driver => 'Pg', + european_dates => ((SL::DBConnect->get_datestyle || '') =~ m/european/i) ? 1 : 0, + connect_options => { + pg_enable_utf8 => 1, + }, + ); + + if (($type eq 'KIVITENDO_AUTH') && $::auth && $::auth->{DB_config} && $::auth->session_tables_present) { + %specific_connect_settings = ( + 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}, + ); + + } elsif ($::auth && $::auth->client) { + my $client = $::auth->client; + %specific_connect_settings = ( + database => $client->{dbname}, + host => $client->{dbhost} || 'localhost', + port => $client->{dbport} || 5432, + username => $client->{dbuser}, + password => $client->{dbpasswd}, + ); + + } elsif (%::myconfig && $::myconfig{dbname}) { + %specific_connect_settings = ( + database => $::myconfig{dbname}, + host => $::myconfig{dbhost} || 'localhost', + port => $::myconfig{dbport} || 5432, + username => $::myconfig{dbuser}, + password => $::myconfig{dbpasswd}, + ); - %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); + } else { + $type = 'KIVITENDO_EMPTY'; } + my %connect_settings = (%common_connect_settings, %specific_connect_settings); 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}"; + $domain = 'KIVITENDO' if $type =~ m/^KIVITENDO/; + $type .= join($SUBSCRIPT_SEPARATOR, map { ($_, $flattened_settings{$_} || '') } sort grep { $_ ne 'dbpasswd' } keys %flattened_settings); + my $idx = "${domain}::${type}"; if (!$_db_registered{$idx}) { $_db_registered{$idx} = 1; @@ -98,19 +107,6 @@ sub _register_db { 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 = (); @@ -171,22 +167,53 @@ configuration. =item C Executes C<$code_ref> with parameters C<@args> within a transaction, -starting one if none is currently active. Example: +starting one only if none is currently active. Example: return $self->db->with_transaction(sub { # do stuff with $self }); -One big difference to L is the return code -handling. If a transaction is already active then C -simply returns the result of calling C<$code_ref> as-is. +There are two big differences between C and +L: the handling of an already-running +transaction and the handling of return values. + +The first difference revolves around when a transaction is started and +committed/rolled back. Rose's C will always start one, +then execute the code reference and commit afterwards (or roll back if +an exception occurs). + +This prevents the caller from combining several pieces of code using +C reliably as results committed by an inner +transaction will be permanent even if the outer transaction is rolled +back. + +Therefore our C works differently: it will only +start a transaction if no transaction is currently active on the +database connection. + +The second big difference to L is the +handling of returned values. Basically our C will +return the values that the code reference C<$code_ref> returns (or +C if the transaction was rolled back). Rose's C +on the other hand will only return a value signaling the transaction's +status. -Otherwise the return value depends on the result of the underlying -transaction. If the transaction fails then C is returned in -scalar context and an empty list in list context. If the transaction -succeeds then the return value of C<$code_ref> is returned preserving +In more detail: + +=over 2 + +=item * If a transaction is already active then C +will simply return the result of calling C<$code_ref> as-is preserving context. +=item * If no transaction is started then C<$code_ref> will be wrapped +in one. C's return value depends on the result of +that transaction. If the it succeeds then the return value of +C<$code_ref> will be returned preserving context. Otherwise C +will be returned in scalar context and an empty list in list context. + +=back + So if you want to differentiate between "transaction failed" and "succeeded" then your C<$code_ref> should never return C itself.