From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 29 Aug 2019 21:42:21 +0000 (-0700)
Subject: quoting fix for asterisk v12+ CDRs stored in Pg, RT#83146
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=024d64da1f139ffbcbb52fe071851b9539bebe31

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

diff --git a/FS/bin/freeside-cdr-asterisk_sql b/FS/bin/freeside-cdr-asterisk_sql
index 7e3c447fa..2c4204548 100755
--- a/FS/bin/freeside-cdr-asterisk_sql
+++ b/FS/bin/freeside-cdr-asterisk_sql
@@ -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