diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2019-08-29 14:42:21 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2019-08-29 14:42:21 -0700 |
| commit | 024d64da1f139ffbcbb52fe071851b9539bebe31 (patch) | |
| tree | 3b95d469927ce86449d118becb0737017fbd0f2e | |
| parent | d75a2141f0f67b07aad07e9d63b0518306597b19 (diff) | |
quoting fix for asterisk v12+ CDRs stored in Pg, RT#83146
| -rwxr-xr-x | FS/bin/freeside-cdr-asterisk_sql | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/FS/bin/freeside-cdr-asterisk_sql b/FS/bin/freeside-cdr-asterisk_sql index 7e3c447..2c42045 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 |