diff options
author | Mitch Jackson <mitch@freeside.biz> | 2019-03-03 19:42:10 -0500 |
---|---|---|
committer | Mitch Jackson <mitch@freeside.biz> | 2019-03-03 19:49:20 -0500 |
commit | 01776c9e52c63662403dcb19155ffe3bc8a035ee (patch) | |
tree | 53d6e06b849ae5089f43e3b61998dc9b4d627760 /FS/FS | |
parent | 70e31cdfd01949235897035ad818e9a7b2d0c958 (diff) |
RT# 82942 Replace DBI->connect() with FS::DBI->connect()
Diffstat (limited to 'FS/FS')
-rw-r--r-- | FS/FS/TicketSystem/RT_External.pm | 5 | ||||
-rw-r--r-- | FS/FS/Upgrade.pm | 5 | ||||
-rw-r--r-- | FS/FS/cdr/Import.pm | 6 | ||||
-rw-r--r-- | FS/FS/cust_main.pm | 3 | ||||
-rw-r--r-- | FS/FS/cust_main/Merge.pm | 5 | ||||
-rw-r--r-- | FS/FS/cust_svc.pm | 13 | ||||
-rw-r--r-- | FS/FS/part_export/a2billing.pm | 5 | ||||
-rw-r--r-- | FS/FS/part_export/acct_sql_status.pm | 5 | ||||
-rw-r--r-- | FS/FS/part_export/freeswitch_nibblebill.pm | 12 | ||||
-rw-r--r-- | FS/FS/part_export/phone_sqlopensips.pm | 5 | ||||
-rw-r--r-- | FS/FS/part_export/radiator.pm | 3 | ||||
-rw-r--r-- | FS/FS/part_export/sql_Common.pm | 3 | ||||
-rw-r--r-- | FS/FS/part_export/sqlmail.pm | 3 | ||||
-rw-r--r-- | FS/FS/part_export/sqlradius.pm | 7 | ||||
-rw-r--r-- | FS/FS/part_pkg/sql_external.pm | 6 | ||||
-rw-r--r-- | FS/FS/part_pkg/sql_generic.pm | 6 |
16 files changed, 53 insertions, 39 deletions
diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm index b5414b9..dfacf95 100644 --- a/FS/FS/TicketSystem/RT_External.pm +++ b/FS/FS/TicketSystem/RT_External.pm @@ -10,6 +10,7 @@ use FS::UID qw(dbh); use FS::Record qw(qsearchs); use FS::cust_main; use Carp qw(cluck); +use FS::DBI; $me = '[FS::TicketSystem::RT_External]'; $DEBUG = 0; @@ -36,8 +37,8 @@ FS::UID->install_callback( sub { $dbh = dbh; if ($conf->config('ticket_system') eq 'RT_External') { my ($datasrc, $user, $pass) = $conf->config('ticket_system-rt_external_datasrc'); - $dbh = DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 }) - or die "RT_External DBI->connect error: $DBI::errstr\n"; + $dbh = FS::DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 }) + or die "RT_External FS::DBI->connect error: $FS::DBI::errstr\n"; $external_url = $conf->config('ticket_system-rt_external_url'); } diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm index 8e6a1f1..8850d36 100644 --- a/FS/FS/Upgrade.pm +++ b/FS/FS/Upgrade.pm @@ -11,6 +11,7 @@ use FS::Record qw(qsearchs qsearch str2time_sql); use FS::queue; use FS::upgrade_journal; use FS::Setup qw( enable_banned_pay_pad ); +use FS::DBI; use FS::svc_domain; $FS::svc_domain::whois_hack = 1; @@ -636,11 +637,11 @@ sub upgrade_sqlradius { my $errmsg = 'Error adding FreesideStatus to '. $part_export->option('datasrc'). ': '; - my $dbh = DBI->connect( + my $dbh = FS::DBI->connect( ( map $part_export->option($_), qw ( datasrc username password ) ), { PrintError => 0, PrintWarn => 0 } ) or do { - warn $errmsg.$DBI::errstr; + warn $errmsg.$FS::DBI::errstr; next; }; diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm index ce7fe8b..29a2fe8 100644 --- a/FS/FS/cdr/Import.pm +++ b/FS/FS/cdr/Import.pm @@ -4,7 +4,7 @@ use strict; use Date::Format 'time2str'; use FS::UID qw(adminsuidsetup dbh); use FS::cdr; -use DBI; +use FS::DBI; use Getopt::Std; use vars qw( $DEBUG ); @@ -77,8 +77,8 @@ sub dbi_import { my $dsn = 'dbi:'. $dbd_type . $queries->{connect_type}; $dsn .= ";database=$database" if $database; - my $dbi = DBI->connect($dsn, $opt{U}, $opt{P}) - or die $DBI::errstr; + my $dbi = FS::DBI->connect($dsn, $opt{U}, $opt{P}) + or die $FS::DBI::errstr; adminsuidsetup $user; diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 112c28d..10433ed 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -80,6 +80,7 @@ use FS::cust_payby; use FS::contact; use FS::reason; use FS::Misc::Savepoint; +use FS::DBI; # 1 is mostly method/subroutine entry and options # 2 traces progress of some operations @@ -1246,7 +1247,7 @@ sub delete { $ticket_dbh = $dbh; } elsif ($conf->config('ticket_system') eq 'RT_External') { my ($datasrc, $user, $pass) = $conf->config('ticket_system-rt_external_datasrc'); - $ticket_dbh = DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 }); + $ticket_dbh = FS::DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 }); #or die "RT_External DBI->connect error: $DBI::errstr\n"; } diff --git a/FS/FS/cust_main/Merge.pm b/FS/FS/cust_main/Merge.pm index be556d2..e0d6d8b 100644 --- a/FS/FS/cust_main/Merge.pm +++ b/FS/FS/cust_main/Merge.pm @@ -3,6 +3,7 @@ package FS::cust_main::Merge; use strict; use vars qw( $conf ); use FS::UID qw( dbh ); +use FS::DBI; use FS::Record qw( qsearch qsearchs ); use FS::agent; use FS::access_user; @@ -215,8 +216,8 @@ sub merge { $ticket_dbh = $dbh; } elsif ($conf->config('ticket_system') eq 'RT_External') { my ($datasrc, $user, $pass) = $conf->config('ticket_system-rt_external_datasrc'); - $ticket_dbh = DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 }); - #or die "RT_External DBI->connect error: $DBI::errstr\n"; + $ticket_dbh = FS::DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 }); + #or die "RT_External FS::DBI->connect error: $DBI::errstr\n"; } if ( $ticket_dbh ) { diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm index 9e16142..cc5f4bf 100644 --- a/FS/FS/cust_svc.pm +++ b/FS/FS/cust_svc.pm @@ -17,6 +17,7 @@ use FS::part_export; use FS::cdr; use FS::UI::Web; use FS::export_cust_svc; +use FS::DBI; #most FS::svc_ classes are autoloaded in svc_x emthod use FS::svc_acct; #this one is used in the cache stuff @@ -857,9 +858,9 @@ sub seconds_since_sqlradacct { warn "$mes connecting to sqlradius database\n" if $DEBUG; - my $dbh = DBI->connect( map { $part_export->option($_) } + my $dbh = FS::DBI->connect( map { $part_export->option($_) } qw(datasrc username password) ) - or die "can't connect to sqlradius database: ". $DBI::errstr; + or die "can't connect to sqlradius database: ". $FS::DBI::errstr; warn "$mes connected to sqlradius database\n" if $DEBUG; @@ -1002,9 +1003,9 @@ sub attribute_since_sqlradacct { warn "$mes connecting to sqlradius database\n" if $DEBUG; - my $dbh = DBI->connect( map { $part_export->option($_) } + my $dbh = FS::DBI->connect( map { $part_export->option($_) } qw(datasrc username password) ) - or die "can't connect to sqlradius database: ". $DBI::errstr; + or die "can't connect to sqlradius database: ". $FS::DBI::errstr; warn "$mes connected to sqlradius database\n" if $DEBUG; @@ -1073,9 +1074,9 @@ sub attribute_last_sqlradacct { warn "$mes connecting to sqlradius database\n" if $DEBUG; - my $dbh = DBI->connect( map { $part_export->option($_) } + my $dbh = FS::DBI->connect( map { $part_export->option($_) } qw(datasrc username password) ) - or die "can't connect to sqlradius database: ". $DBI::errstr; + or die "can't connect to sqlradius database: ". $FS::DBI::errstr; warn "$mes connected to sqlradius database\n" if $DEBUG; diff --git a/FS/FS/part_export/a2billing.pm b/FS/FS/part_export/a2billing.pm index dbbd1be..f636654 100644 --- a/FS/FS/part_export/a2billing.pm +++ b/FS/FS/part_export/a2billing.pm @@ -11,6 +11,7 @@ use FS::svc_phone; use Locale::Country qw(country_code2code); use Date::Format qw(time2str); use Carp qw( cluck ); +use FS::DBI; @ISA = qw(FS::part_export); @@ -55,11 +56,11 @@ END sub dbh { my $self = shift; - $self->{dbh} ||= DBI->connect( + $self->{dbh} ||= FS::DBI->connect( $self->option('datasrc'), $self->option('username'), $self->option('password') - ) or die $DBI::errstr; + ) or die $FS::DBI::errstr; $self->{dbh}->trace(1, '%%%FREESIDE_LOG%%%/a2b_exportlog.'.$self->exportnum) if $DEBUG; diff --git a/FS/FS/part_export/acct_sql_status.pm b/FS/FS/part_export/acct_sql_status.pm index 248105f..0e73431 100644 --- a/FS/FS/part_export/acct_sql_status.pm +++ b/FS/FS/part_export/acct_sql_status.pm @@ -5,6 +5,7 @@ use strict; use warnings; use vars qw( %info ); use Tie::IxHash; +use FS::DBI; tie my %options, 'Tie::IxHash', %{__PACKAGE__->sql_options}; delete $options{$_} for qw( table schema static primary_key ); @@ -33,8 +34,8 @@ sub _export_unsuspend {} sub export_getstatus { my($self, $svc_acct, $htmlref, $hashref) = @_; - my $dbh = DBI->connect( map $self->option($_), qw(datasrc username password) ) - or return "can't connect: ". $DBI::errstr; + my $dbh = FS::DBI->connect( map $self->option($_), qw(datasrc username password) ) + or return "can't connect: ". $FS::DBI::errstr; ### #vacation settings diff --git a/FS/FS/part_export/freeswitch_nibblebill.pm b/FS/FS/part_export/freeswitch_nibblebill.pm index 6611f78..9214445 100644 --- a/FS/FS/part_export/freeswitch_nibblebill.pm +++ b/FS/FS/part_export/freeswitch_nibblebill.pm @@ -3,7 +3,7 @@ use base qw( FS::part_export ); use vars qw( %info ); # $DEBUG ); use Tie::IxHash; -use DBI; +use FS::DBI; #use FS::Record qw( qsearch ); #qsearchs ); #use FS::svc_phone; #use FS::Schema qw( dbdef ); @@ -61,7 +61,8 @@ sub _export_insert { sub nibblebill_insert { my($datasrc, $username, $password, $phonenum, $amount) = @_; - my $dbh = DBI->connect($datasrc, $username, $password) or die $DBI::errstr; + my $dbh = FS::DBI->connect($datasrc, $username, $password) + or die $FS::DBI::errstr; #check for existing account $dbh->{FetchHashKeyName} = 'NAME_lc'; @@ -119,7 +120,8 @@ sub _adjust { sub nibblebill_adjust_cash { my($datasrc, $username, $password, $phonenum, $amount) = @_; - my $dbh = DBI->connect($datasrc, $username, $password) or die $DBI::errstr; + my $dbh = FS::DBI->connect($datasrc, $username, $password) + or die $FS::DBI::errstr; my $sth = $dbh->prepare('UPDATE accounts SET cash = cash + ? WHERE id = ?') or die $dbh->errsrr; @@ -129,8 +131,8 @@ sub nibblebill_adjust_cash { sub export_getstatus { my( $self, $svc_phone, $htmlref, $hashref ) = @_; - my $dbh = DBI->connect( map $self->option($_), qw( datasrc username password ) ) - or return $DBI::errstr; + my $dbh = FS::DBI->connect( map $self->option($_), qw( datasrc username password ) ) + or return $FS::DBI::errstr; my $sth = $dbh->prepare('SELECT cash FROM accounts WHERE id = ?') or return $dbh->errstr; diff --git a/FS/FS/part_export/phone_sqlopensips.pm b/FS/FS/part_export/phone_sqlopensips.pm index 7b07ecf..c281787 100644 --- a/FS/FS/part_export/phone_sqlopensips.pm +++ b/FS/FS/part_export/phone_sqlopensips.pm @@ -8,6 +8,7 @@ use FS::part_export; use FS::svc_phone; use FS::export_svc; use LWP::UserAgent; +use FS::DBI; @ISA = qw(FS::part_export); @@ -51,8 +52,8 @@ sub _export_insert { sub opensips_connect { my $self = shift; - DBI->connect($self->option('datasrc'),$self->option('username'), - $self->option('password')) or die $DBI::errstr; + FS::DBI->connect($self->option('datasrc'),$self->option('username'), + $self->option('password')) or die $FS::DBI::errstr; } sub _export_replace { diff --git a/FS/FS/part_export/radiator.pm b/FS/FS/part_export/radiator.pm index f09d36a..669e3d4 100644 --- a/FS/FS/part_export/radiator.pm +++ b/FS/FS/part_export/radiator.pm @@ -3,6 +3,7 @@ package FS::part_export::radiator; use vars qw(@ISA %info $radusers); use Tie::IxHash; use FS::part_export::sqlradius; +use FS::DBI; tie my %options, 'Tie::IxHash', %FS::part_export::sqlradius::options; @@ -163,7 +164,7 @@ sub radiator_delete { #subroutine, not method sub radiator_connect { #my($datasrc, $username, $password) = @_; #DBI->connect($datasrc, $username, $password) or die $DBI::errstr; - DBI->connect(@_) or die $DBI::errstr; + FS::DBI->connect(@_) or die $FS::DBI::errstr; } 1; diff --git a/FS/FS/part_export/sql_Common.pm b/FS/FS/part_export/sql_Common.pm index 6aab7ec..d91c547 100644 --- a/FS/FS/part_export/sql_Common.pm +++ b/FS/FS/part_export/sql_Common.pm @@ -3,6 +3,7 @@ use base qw( FS::part_export ); use strict; use Tie::IxHash; +use FS::DBI; tie my %options, 'Tie::IxHash', 'datasrc' => { label => 'DBI data source' }, @@ -208,7 +209,7 @@ sub sql_Common_replace { #subroutine, not method sub sql_Common_connect { #my($datasrc, $username, $password) = @_; #DBI->connect($datasrc, $username, $password) or die $DBI::errstr; - DBI->connect(@_) or die $DBI::errstr; + FS::DBI->connect(@_) or die $FS::DBI::errstr; } 1; diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm index 19505b4..38308b6 100644 --- a/FS/FS/part_export/sqlmail.pm +++ b/FS/FS/part_export/sqlmail.pm @@ -6,6 +6,7 @@ use Digest::MD5 qw(md5_hex); use FS::Record qw(qsearchs); use FS::part_export; use FS::svc_domain; +use FS::DBI; @ISA = qw(FS::part_export); @@ -174,7 +175,7 @@ sub sqlmail_replace { } sub sqlmail_connect { - DBI->connect(@_) or die $DBI::errstr; + FS::DBI->connect(@_) or die $FS::DBI::errstr; } sub update_values { diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm index 926e36f..764db2e 100644 --- a/FS/FS/part_export/sqlradius.pm +++ b/FS/FS/part_export/sqlradius.pm @@ -11,6 +11,7 @@ use FS::export_svc; use Carp qw( carp cluck ); use NEXT; use Net::OpenSSH; +use FS::DBI; @ISA = qw(FS::part_export); @EXPORT_OK = qw( sqlradius_connect ); @@ -660,7 +661,7 @@ sub sqlradius_delete { #subroutine, not method sub sqlradius_connect { #my($datasrc, $username, $password) = @_; #DBI->connect($datasrc, $username, $password) or die $DBI::errstr; - DBI->connect(@_) or die $DBI::errstr; + FS::DBI->connect(@_) or die $FS::DBI::errstr; } # on success, returns '' in scalar context, ('',$jobnum) in list context @@ -1414,10 +1415,10 @@ sub _upgrade_exporttype { sub import_attrs { my $self = shift; - my $dbh = DBI->connect( map $self->option($_), + my $dbh = FS::DBI->connect( map $self->option($_), qw( datasrc username password ) ); unless ( $dbh ) { - warn "Error connecting to RADIUS server: $DBI::errstr\n"; + warn "Error connecting to RADIUS server: $FS::DBI::errstr\n"; return; } diff --git a/FS/FS/part_pkg/sql_external.pm b/FS/FS/part_pkg/sql_external.pm index 3cdfe99..5233c54 100644 --- a/FS/FS/part_pkg/sql_external.pm +++ b/FS/FS/part_pkg/sql_external.pm @@ -3,7 +3,7 @@ use base qw( FS::part_pkg::discount_Mixin FS::part_pkg::recur_Common ); use strict; use vars qw( %info ); -use DBI; +use FS::DBI; #use FS::Record qw(qsearch qsearchs); tie our %query_style, 'Tie::IxHash', ( @@ -75,10 +75,10 @@ sub calc_recur { my $price = 0; my $quantity; # can be overridden; if not we use the default - my $dbh = DBI->connect( map { $self->option($_) } + my $dbh = FS::DBI->connect( map { $self->option($_) } qw( datasrc db_username db_password ) ) - or die $DBI::errstr; + or die $FS::DBI::errstr; my $sth = $dbh->prepare( $self->option('query') ) or die $dbh->errstr; diff --git a/FS/FS/part_pkg/sql_generic.pm b/FS/FS/part_pkg/sql_generic.pm index 0a875b0..063af44 100644 --- a/FS/FS/part_pkg/sql_generic.pm +++ b/FS/FS/part_pkg/sql_generic.pm @@ -2,7 +2,7 @@ package FS::part_pkg::sql_generic; use strict; use vars qw(@ISA %info); -use DBI; +use FS::DBI; #use FS::Record qw(qsearch qsearchs); use FS::part_pkg::flat; @@ -50,10 +50,10 @@ sub price_info { sub calc_recur { my($self, $cust_pkg ) = @_; - my $dbh = DBI->connect( map { $self->option($_) } + my $dbh = FS::DBI->connect( map { $self->option($_) } qw( datasrc db_username db_password ) ) - or die $DBI::errstr; + or die $FS::DBI::errstr; my $sth = $dbh->prepare( $self->option('query') ) or die $dbh->errstr; |