From: Philippe Wooding <philippe.wooding@networkradius.com>
Date: Tue, 12 May 2015 05:41:40 +0000 (+0200)
Subject: Make MySQL & SQLite queries more robust
X-Git-Tag: release_3_0_9~287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edbeeb2741b6308f195f3f8558c3f84a3f281092;p=thirdparty%2Ffreeradius-server.git

Make MySQL & SQLite queries more robust
---

diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index f2c9b702335..0d5965adb2f 100644
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -293,7 +293,7 @@ accounting {
 					acctinterval    = %{integer:Event-Timestamp} - \
 						UNIX_TIMESTAMP(@acctupdatetime_old), \
 					framedipaddress = '%{Framed-IP-Address}', \
-					acctsessiontime = '%{Acct-Session-Time}', \
+					acctsessiontime = %{%{Acct-Session-Time}:-NULL}, \
 					acctinputoctets = '%{%{Acct-Input-Gigawords}:-0}' \
 						<< 32 | '%{%{Acct-Input-Octets}:-0}', \
 					acctoutputoctets = '%{%{Acct-Output-Gigawords}:-0}' \
@@ -320,7 +320,7 @@ accounting {
 					FROM_UNIXTIME(%{integer:Event-Timestamp} - %{%{Acct-Session-Time}:-0}), \
 					FROM_UNIXTIME(%{integer:Event-Timestamp}), \
 					NULL, \
-					'%{Acct-Session-Time}', \
+					%{%{Acct-Session-Time}:-NULL}, \
 					'%{Acct-Authentic}', \
 					'%{Connect-Info}', \
 					'', \
@@ -342,7 +342,7 @@ accounting {
 				UPDATE ${....acct_table2} SET \
 					acctstoptime	= FROM_UNIXTIME(\
 						%{integer:Event-Timestamp}), \
-					acctsessiontime	= '%{Acct-Session-Time}', \
+					acctsessiontime	= %{%{Acct-Session-Time}:-NULL}, \
 					acctinputoctets	= '%{%{Acct-Input-Gigawords}:-0}' \
 						<< 32 | '%{%{Acct-Input-Octets}:-0}', \
 					acctoutputoctets = '%{%{Acct-Output-Gigawords}:-0}' \
@@ -371,7 +371,7 @@ accounting {
 					FROM_UNIXTIME(%{integer:Event-Timestamp} - %{%{Acct-Session-Time}:-0}), \
 					FROM_UNIXTIME(%{integer:Event-Timestamp}), \
 					FROM_UNIXTIME(%{integer:Event-Timestamp}), \
-					'%{Acct-Session-Time}', \
+					%{%{Acct-Session-Time}:-NULL}, \
 					'%{Acct-Authentic}', \
 					'', \
 					'%{Connect-Info}', \
diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index bd8b57b6e57..be143aa30c0 100644
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -278,7 +278,7 @@ accounting {
 					acctupdatetime  = %{%{integer:Event-Timestamp}:-date('now')}, \
 					acctinterval    = 0, \
 					framedipaddress = '%{Framed-IP-Address}', \
-					acctsessiontime = '%{Acct-Session-Time}', \
+					acctsessiontime = %{%{Acct-Session-Time}:-NULL}, \
 					acctinputoctets = %{%{Acct-Input-Gigawords}:-0} \
 						<< 32 | %{%{Acct-Input-Octets}:-0}, \
 					acctoutputoctets = %{%{Acct-Output-Gigawords}:-0} \
@@ -305,7 +305,7 @@ accounting {
 					(%{%{integer:Event-Timestamp}:-strftime('%%s', 'now')} - %{%{Acct-Session-Time}:-0}), \
 					%{%{integer:Event-Timestamp}:-date('now')}, \
 					NULL, \
-					'%{Acct-Session-Time}', \
+					%{%{Acct-Session-Time}:-NULL}, \
 					'%{Acct-Authentic}', \
 					'%{Connect-Info}', \
 					'', \
@@ -328,7 +328,7 @@ accounting {
 			query = "\
 				UPDATE ${....acct_table2} SET \
 					acctstoptime	= %{%{integer:Event-Timestamp}:-date('now')}, \
-					acctsessiontime	= '%{Acct-Session-Time}', \
+					acctsessiontime	= %{%{Acct-Session-Time}:-NULL}, \
 					acctinputoctets	= %{%{Acct-Input-Gigawords}:-0} \
 						<< 32 | %{%{Acct-Input-Octets}:-0}, \
 					acctoutputoctets = %{%{Acct-Output-Gigawords}:-0} \
@@ -357,7 +357,7 @@ accounting {
 					(%{%{integer:Event-Timestamp}:-strftime('%%s', 'now')} - %{%{Acct-Session-Time}:-0}), \
 					%{%{integer:Event-Timestamp}:-date('now')}, \
 					%{%{integer:Event-Timestamp}:-date('now')}, \
-					'%{Acct-Session-Time}', \
+					%{%{Acct-Session-Time}:-NULL}, \
 					'%{Acct-Authentic}', \
 					'', \
 					'%{Connect-Info}', \