quoting fix for asterisk v12+ CDRs stored in Pg, RT#83146

[freeside.git] / FS / bin / freeside-cdr-asterisk_sql

diff --git a/FS/bin/freeside-cdr-asterisk_sql b/FS/bin/freeside-cdr-asterisk_sql
index e32ccfe..2c42045 100755 (executable)
--- 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
   );
 }
 
@@ -56,7 +56,12 @@ if ( $engine =~ /^mysql/ ) {
 
 my @cols = ();
 if ( $opt{V} >= 12 ) {
-  push @cols, qw( id start answer end );
+  push @cols, qw( id start answer );
+  if ( $engine =~ /^Pg/ ) {
+    push @cols, "'end'";
+  } else {
+    push @cols, "end";
+  }
 } else {
   push @cols, qw( calldate );
 }
@@ -182,7 +187,7 @@ sub log_and_warn {
 
 
 sub usage {
-  "Usage: \n  freeside-cdr-asterisk_sql\n\t-e mysql|Pg|... [ -H host ]n\t-D database\n\t[ -T table ]\n\t[ -V asterisk_version]\n\t-U user\n\t-P password\n\tfreesideuser\n";
+  "Usage: \n  freeside-cdr-asterisk_sql\n\t-e mysql|Pg|... [ -H host ]\n\t-D database\n\t[ -T table ]\n\t[ -V asterisk_version]\n\t-U user\n\t-P password\n\tfreesideuser\n";
 }
 
 =head1 NAME