RT# 82942 Replace DBI->connect() with FS::DBI->connect()

6 files changed, 16 insertions, 12 deletions

diff --git a/FS/bin/freeside-aradial-sftp_and_import b/FS/bin/freeside-aradial-sftp_and_import
index 668ec49ba..e7639633a 100755
--- a/FS/bin/freeside-aradial-sftp_and_import
+++ b/FS/bin/freeside-aradial-sftp_and_import
@@ -8,6 +8,7 @@ use Date::Parse;
 use Date::Format;
 use Text::CSV_XS;
 use DBI qw( :sql_types );
+use FS::DBI;
 use Net::SFTP::Foreign;
 #use FS::UID qw( adminsuidsetup datasrc );
 
@@ -81,8 +82,8 @@ mkdir $cachedir unless -d $cachedir;
 my $servername = shift or die &usage;
 
 my( $datasrc, $db_user, $db_pass ) = ( shift, shift, shift );
-my $dbh = DBI->connect( $datasrc, $db_user, $db_pass)
-  or die "can't connect: $DBI::errstr\n";
+my $dbh = FS::DBI->connect( $datasrc, $db_user, $db_pass)
+  or die "can't connect: $FS::DBI::errstr\n";
 
 my $csv = Text::CSV_XS->new;
 
diff --git a/FS/bin/freeside-cdr-asterisk_sql b/FS/bin/freeside-cdr-asterisk_sql
index e32ccfe82..7e3c447fa 100755
--- a/FS/bin/freeside-cdr-asterisk_sql
+++ b/FS/bin/freeside-cdr-asterisk_sql
@@ -7,7 +7,7 @@ use Date::Format 'time2str';
 use FS::UID qw(adminsuidsetup dbh);
 use FS::Log;
 use FS::cdr;
-use DBI;
+use FS::DBI;
 use Getopt::Std;
 
 $DEBUG = 0;
@@ -26,7 +26,7 @@ adminsuidsetup $user;
 
 my $log = FS::Log->new( 'freeside-cdr-asterisk_sql' );
 
-my $dbi = DBI->connect($dsn, $opt{U}, $opt{P}) ;
+my $dbi = FS::DBI->connect($dsn, $opt{U}, $opt{P}) ;
 
 if ( $dbi ) {
   log_msg( info => "Established connection to CDR database at dsn($dsn)" );
@@ -34,7 +34,7 @@ if ( $dbi ) {
   log_and_die( error =>
     sprintf 'Fatal error connecting to CDR database at dsn(%s): %s',
       $dsn,
-      $DBI::errstr
+      $FS::DBI::errstr
   );
 }
 
diff --git a/FS/bin/freeside-cdr-evariste-import b/FS/bin/freeside-cdr-evariste-import
index d5e13f98c..a875d1365 100755
--- a/FS/bin/freeside-cdr-evariste-import
+++ b/FS/bin/freeside-cdr-evariste-import
@@ -2,7 +2,7 @@
 
 use strict;
 
-use DBI;
+use FS::DBI;
 use Date::Format 'time2str';
 use Date::Parse 'str2time';
 use Getopt::Long;
@@ -65,8 +65,8 @@ if ($enddate) {
 }
 $enddate ||= time2str("%Y-%m-%d %H:%M:%S",$now);
 
-my $cdbh = DBI->connect("dbi:Pg:database=$db;host=$host", $username, $password) 
-  or die $DBI::errstr;
+my $cdbh = FS::DBI->connect("dbi:Pg:database=$db;host=$host", $username, $password) 
+  or die $FS::DBI::errstr;
 
 # selecting by end_time rather than start_time 
 # so we don't lose records between batches
diff --git a/FS/bin/freeside-sqlradius-dedup-group b/FS/bin/freeside-sqlradius-dedup-group
index 441d50f62..c6497a051 100755
--- a/FS/bin/freeside-sqlradius-dedup-group
+++ b/FS/bin/freeside-sqlradius-dedup-group
@@ -3,6 +3,7 @@
 use strict;
 use vars qw( %seen @dups );
 use Getopt::Std;
+use FS::DBI;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_export;
@@ -28,7 +29,7 @@ if ( !defined($export_x) ) {
   or die "No sqlradius exports specified.";
 
 foreach my $part_export ( @part_export ) {
-  my $dbh = DBI->connect( map $part_export->option($_),
+  my $dbh = FS::DBI->connect( map $part_export->option($_),
                            qw ( datasrc username password ) );
 
   my $sth = $dbh->prepare("SELECT id,username,groupname
diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
index b04c640d8..225de15be 100755
--- a/FS/bin/freeside-sqlradius-reset
+++ b/FS/bin/freeside-sqlradius-reset
@@ -3,6 +3,7 @@
 use strict;
 use vars qw( $opt_n );
 use Getopt::Std;
+use FS::DBI;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_export;
@@ -31,9 +32,9 @@ if ( @ARGV ) {
 
 unless ( $opt_n ) {
   foreach my $export ( @exports ) {
-    my $icradius_dbh = DBI->connect(
+    my $icradius_dbh = FS::DBI->connect(
       map { $export->option($_) } qw( datasrc username password )
-    ) or die $DBI::errstr;
+    ) or die $FS::DBI::errstr;
     my $usergroup = $export->option('usergroup') || 'usergroup';
     my @attr_tables;
     @attr_tables = qw( radgroupcheck radgroupreply )
diff --git a/FS/bin/freeside-sqlradius-set-lastlog b/FS/bin/freeside-sqlradius-set-lastlog
index ad8563076..d5d8a493a 100755
--- a/FS/bin/freeside-sqlradius-set-lastlog
+++ b/FS/bin/freeside-sqlradius-set-lastlog
@@ -2,6 +2,7 @@
 
 use strict;
 use Getopt::Std;
+use FS::DBI;
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearch qsearchs str2time_sql);
 use FS::Conf;
@@ -34,7 +35,7 @@ if ( !defined($export_x) ) {
 
 
 foreach my $part_export ( @part_export ) {
-  my $dbh = DBI->connect( map $part_export->option($_),
+  my $dbh = FS::DBI->connect( map $part_export->option($_),
                            qw ( datasrc username password ) );
 
   my $str2time = str2time_sql( $dbh->{Driver}->{Name} );