use strict;
use vars qw(
- @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user
- $conf_dir $cache_dir $secrets $datasrc $db_user $db_pass %callback @callback
- $driver_name $AutoCommit
+ @ISA @EXPORT_OK $cgi $freeside_uid $user $conf_dir $cache_dir
+ $secrets $datasrc $db_user $db_pass $schema $dbh $driver_name
+ $AutoCommit %callback @callback
);
use subs qw(
getsecrets cgisetotaker
}
sub myconnect {
- DBI->connect( getsecrets(@_), { 'AutoCommit' => 0,
- 'ChopBlanks' => 1,
- 'ShowErrorStatement' => 1,
- }
- )
+ my $handle = DBI->connect( getsecrets(@_), { 'AutoCommit' => 0,
+ 'ChopBlanks' => 1,
+ 'ShowErrorStatement' => 1,
+ }
+ )
or die "DBI->connect error: $DBI::errstr\n";
+
+ if ( $schema ) {
+ use DBIx::DBSchema::_util qw(_load_driver ); #quelle hack
+ my $driver = _load_driver($handle);
+ if ( $driver =~ /^Pg/ ) {
+ no warnings 'redefine';
+ eval "sub DBIx::DBSchema::DBD::${driver}::default_db_schema {'$schema'}";
+ die $@ if $@;
+ }
+ }
+
+ $handle;
}
=item install_callback
$secrets = 'secrets';
}
- ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
+ ($datasrc, $db_user, $db_pass, $schema) = $conf->config($secrets)
or die "Can't get secrets: $secrets: $!\n";
- $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
undef $driver_name;
+
+ no warnings 'once';
+ $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
+
($datasrc, $db_user, $db_pass);
}