From: Terry Burton <tez@terryburton.co.uk>
Date: Tue, 13 Aug 2019 19:22:31 +0000 (+0100)
Subject: Oracle queries.conf: Use Event-Timestamp rather than %S
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4d62486591c1c32a03f4e81f35f7a072ce2d54a;p=thirdparty%2Ffreeradius-server.git

Oracle queries.conf: Use Event-Timestamp rather than %S
---

diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf
index 71010750957..a4c1e5028aa 100644
--- a/raddb/mods-config/sql/main/oracle/queries.conf
+++ b/raddb/mods-config/sql/main/oracle/queries.conf
@@ -140,14 +140,14 @@ accounting {
 			query = "\
 				UPDATE ${....acct_table1} \
 				SET \
-					AcctStopTime = TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), \
-					AcctSessionTime = round((TO_DATE('%S','yyyy-mm-dd hh24:mi:ss') - \
+					AcctStopTime = TO_DATE('1970-01-01','YYYY-MM-DD') + NUMTODSINTERVAL(%{%{integer:Event-Timestamp}:-%l},'SECOND'), \
+					AcctSessionTime = ROUND((TO_DATE('1970-01-01','YYYY-MM-DD') + NUMTODSINTERVAL(%{%{integer:Event-Timestamp}:-%l},'SECOND') - \
 						TO_DATE(TO_CHAR(acctstarttime, 'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss'))*86400), \
 					AcctTerminateCause='%{%{Acct-Terminate-Cause}:-NAS-Reboot}', \
 					AcctStopDelay = %{%{Acct-Delay-Time}:-0} \
 				WHERE AcctStopTime IS NULL \
 				AND NASIPAddress = '%{NAS-IP-Address}' \
-				AND AcctStartTime <= TO_DATE('%S','yyyy-mm-dd hh24:mi:ss')"
+				AND AcctStartTime <= TO_DATE('1970-01-01','YYYY-MM-DD') + NUMTODSINTERVAL(%{%{integer:Event-Timestamp}:-%l},'SECOND')"
 		}
 
 		accounting-off {
@@ -195,7 +195,7 @@ accounting {
 					'%{NAS-IP-Address}', \
 					'%{%{NAS-Port-ID}:-%{NAS-Port}}', \
 					'%{NAS-Port-Type}', \
-					TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), \
+					TO_DATE('1970-01-01','YYYY-MM-DD') + NUMTODSINTERVAL(%{%{integer:Event-Timestamp}:-%l},'SECOND'), \
 					NULL, \
 					'0', \
 					'%{Acct-Authentic}', \
@@ -220,7 +220,7 @@ accounting {
 			query = "\
 				UPDATE ${....acct_table1} \
 				SET \
-					AcctStartTime = TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), \
+					AcctStartTime = TO_DATE('1970-01-01','YYYY-MM-DD') + NUMTODSINTERVAL(%{%{integer:Event-Timestamp}:-%l},'SECOND'), \
 					AcctStartDelay = '%{%{Acct-Delay-Time}:-0}', \
 					ConnectInfo_start = '%{Connect-Info}' \
 				WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \
@@ -297,7 +297,7 @@ accounting {
 			query = "\
 				UPDATE ${....acct_table2} \
 				SET \
-					AcctStopTime = TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), \
+					AcctStopTime = TO_DATE('1970-01-01','YYYY-MM-DD') + NUMTODSINTERVAL(%{%{integer:Event-Timestamp}:-%l},'SECOND'), \
 					AcctSessionTime = '%{Acct-Session-Time}', \
 					AcctInputOctets = '%{Acct-Input-Octets}' + \
 						('%{%{Acct-Input-Gigawords}:-0}' * 4294967296), \
@@ -345,7 +345,7 @@ accounting {
 					'%{%{NAS-Port-ID}:-%{NAS-Port}}', \
 					'%{NAS-Port-Type}', \
 					NULL, \
-					TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), \
+					TO_DATE('1970-01-01','YYYY-MM-DD') + NUMTODSINTERVAL(%{%{integer:Event-Timestamp}:-%l},'SECOND'), \
 					'%{Acct-Session-Time}', \
 					'%{Acct-Authentic}', \
 					'', \