Switch to using session_identifier in MySQL

diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index 0d5965a..1906c1a 100644 (file)
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -196,6 +196,11 @@ simul_verify_query = "\
 accounting {
        reference = "%{tolower:type.%{Acct-Status-Type}.query}"
 
+       #
+       #  The session identifier used by all subsequent queries.
+       #
+       session_identifier="(acctuniqueid = '%{Acct-Unique-Session-Id}')"
+
        # Write SQL queries to a logfile. This is potentially useful for bulk inserts
        # when used with the rlm_sql_null driver.
 #      logfile = ${logdir}/accounting.sql
@@ -273,7 +278,7 @@ accounting {
                                        acctstarttime   = FROM_UNIXTIME(%{integer:Event-Timestamp}), \
                                        acctupdatetime  = FROM_UNIXTIME(%{integer:Event-Timestamp}), \
                                        connectinfo_start = '%{Connect-Info}' \
-                               WHERE acctsessionid = '%{Acct-Session-Id}' \
+                               WHERE ${...session_identifier} \
                                AND username            = '%{SQL-User-Name}' \
                                AND nasipaddress        = '%{NAS-IP-Address}'"
                }
@@ -298,7 +303,7 @@ accounting {
                                                << 32 | '%{%{Acct-Input-Octets}:-0}', \
                                        acctoutputoctets = '%{%{Acct-Output-Gigawords}:-0}' \
                                                << 32 | '%{%{Acct-Output-Octets}:-0}' \
-                               WHERE acctsessionid     = '%{Acct-Session-Id}' \
+                               WHERE ${...session_identifier} \
                                AND username            = '%{SQL-User-Name}' \
                                AND nasipaddress        = '%{NAS-IP-Address}'"
 
@@ -349,7 +354,7 @@ accounting {
                                                << 32 | '%{%{Acct-Output-Octets}:-0}', \
                                        acctterminatecause = '%{Acct-Terminate-Cause}', \
                                        connectinfo_stop = '%{Connect-Info}' \
-                               WHERE acctsessionid     = '%{Acct-Session-Id}' \
+                               WHERE ${...session_identifier} \
                                AND username            = '%{SQL-User-Name}' \
                                AND nasipaddress        = '%{NAS-IP-Address}'"