Use newer style alternation in oracle queries
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 27 Mar 2014 08:55:23 +0000 (08:55 +0000)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 27 Mar 2014 08:55:31 +0000 (08:55 +0000)
raddb/mods-config/sql/main/oracle/queries.conf

index 8fe71ba..a595057 100644 (file)
@@ -190,7 +190,7 @@ accounting {
                                        AcctSessionTime = round((TO_DATE('%S','yyyy-mm-dd hh24:mi:ss') - \
                                                TO_DATE(TO_CHAR(acctstarttime, 'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss'))*86400), \
                                        AcctTerminateCause='%{Acct-Terminate-Cause}', \
-                                       AcctStopDelay = %{Acct-Delay-Time:-0} \
+                                       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')"
@@ -243,7 +243,7 @@ accounting {
                                UPDATE ${....acct_table1} \
                                SET \
                                        AcctStartTime = TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), \
-                                       AcctStartDelay = '%{Acct-Delay-Time:-0}', \
+                                       AcctStartDelay = '%{%{Acct-Delay-Time}:-0}', \
                                        ConnectInfo_start = '%{Connect-Info}' \
                                WHERE AcctSessionId = '%{Acct-Session-Id}' \
                                AND UserName = '%{SQL-User-Name}' \
@@ -312,7 +312,7 @@ accounting {
                                        AcctOutputOctets = '%{Acct-Output-Octets}' +  \
                                                ('%{%{Acct-Output-Gigawords}:-0}' * 4294967296), \
                                        AcctTerminateCause = '%{Acct-Terminate-Cause}', \
-                                       AcctStopDelay = '%{Acct-Delay-Time:-0}', \
+                                       AcctStopDelay = '%{%{Acct-Delay-Time}:-0}', \
                                        ConnectInfo_stop = '%{Connect-Info}' \
                                WHERE AcctSessionId = '%{Acct-Session-Id}' \
                                AND UserName = '%{SQL-User-Name}' \
@@ -355,7 +355,7 @@ accounting {
                                        '%{Framed-Protocol}', \
                                        '%{Framed-IP-Address}', \
                                        '0', \
-                                       '%{Acct-Delay-Time:-0}')"
+                                       '%{%{Acct-Delay-Time}:-0}')"
 
                }
        }