use Carp;
use Data::Dumper;
-use SL::DBConnect;
use English qw(-no_match_vars);
use Rose::DB;
use Rose::DBx::Cache::Anywhere;
__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(@_);
}
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 _register_db {
my $domain = shift;
my $type = shift;
+ 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 => $::locale && $::locale->is_utf8,
+ pg_enable_utf8 => 1,
},
);
- if ($::myconfig{dateformat}) {
- $common_connect_settings{european_dates} = 1 if ($_dateformats{ $::myconfig{dateformat} } || '') =~ m/european/i;
- }
-
if (($type eq 'KIVITENDO_AUTH') && $::auth && $::auth->{DB_config} && $::auth->session_tables_present) {
%specific_connect_settings = (
database => $::auth->{DB_config}->{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 = ();