[freeside-commits] branch master updated. d5c89b967ff6685e3e7ff363a563102f8b7ef420

[Ivan]

The branch, master has been updated
       via  d5c89b967ff6685e3e7ff363a563102f8b7ef420 (commit)
      from  dd671563e488044645ab388468f7b2f82fb15fc4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d5c89b967ff6685e3e7ff363a563102f8b7ef420
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jun 30 14:36:54 2014 -0700

    use a separate table for freesidestatus for IVR imports, RT#39055

diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm
index 472e220..e788712 100644
--- a/FS/FS/cdr/Import.pm
+++ b/FS/FS/cdr/Import.pm
@@ -83,7 +83,7 @@ sub dbi_import {
   #my @cols = values %{ $args{column_map} };
   my $sql = "SELECT * FROM $table "; # join(',', @cols). " FROM $table ".
   $sql .=  'LEFT JOIN '. $args{status_table}.
-           ' USING ( '. $args{primary_key}. ' )'
+           " ON ( $table.$pkey = ". $args{status_table}. ".$pkey )"
     if $args{status_table};
   $sql .= ' WHERE freesidestatus IS NULL ';
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cdr/Import.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)