From d979d53c0a6fdec99bfd3bf9c6b246b14c101507 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sun, 31 Aug 2014 13:11:35 -0700 Subject: [PATCH] fix inserts and don't generate extra noise on trailing blanks, RT#29053 --- bin/aradial-sftp_and_import | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/aradial-sftp_and_import b/bin/aradial-sftp_and_import index cc2238e1f..b0878e277 100755 --- a/bin/aradial-sftp_and_import +++ b/bin/aradial-sftp_and_import @@ -157,6 +157,9 @@ foreach my $filename ( @$ls ) { my @keys = keys %dbhash; + #skip blank records + next unless grep defined($_), values %dbhash; + $hash{'Status-Type'} = $status_type{ $hash{'Status-Type'} } if exists $status_type{ $hash{'Status-Type'} }; @@ -166,8 +169,8 @@ foreach my $filename ( @$ls ) { $dbhash{'AcctStartTime'} = $hash{'Date'}; - $sql = 'INSERT INTO radacct ( ', join(',', @keys). - ' ) VALUES ( '. map( ' ? ', @keys ). ' )'; + $sql = 'INSERT INTO radacct ( '. join(',', @keys). + ' ) VALUES ( '. join(',', map ' ? ', @keys ). ' )'; } elsif ( $hash{'Status-Type'} eq 'Stop' ) { @@ -194,6 +197,7 @@ foreach my $filename ( @$ls ) { foreach my $value ( map $dbhash{$_}, @keys ) { my $key = shift @keys; my $type = exists($bind_type{$key}) ? $bind_type{$key} : SQL_VARCHAR; + $value ||= 0 if $type == SQL_INTEGER; $sth->bind_param($p_num++, $value, $type); } foreach my $value ( @extra_values ) { -- 2.11.0