From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 12 Aug 2024 01:29:38 +0000 (-0400)
Subject: remove AcctStopDelay from Oracle and MS-SQL.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95a4d68fbe7e3665282f87611dfb9b07341e458c;p=thirdparty%2Ffreeradius-server.git

remove AcctStopDelay from Oracle and MS-SQL.

It hasn't been used.  Ever.
---

diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf
index 5ba0251d297..ce8cf1e73b1 100644
--- a/raddb/mods-config/sql/main/mssql/queries.conf
+++ b/raddb/mods-config/sql/main/mssql/queries.conf
@@ -129,8 +129,7 @@ accounting {
 				AcctStopTime=${...event_timestamp}, \
 				AcctSessionTime=${...event_timestamp_epoch} - \
 					DATEDIFF(SS, '1970-01-01', AcctStartTime), \
-				AcctTerminateCause='%{&Acct-Terminate-Cause || 'NAS-Reboot'}', \
-				AcctStopDelay = %{&Acct-Delay-Time || 0} \
+				AcctTerminateCause='%{&Acct-Terminate-Cause || 'NAS-Reboot'}' \
 			WHERE AcctStopTime = 0 \
 			AND NASIPAddress = '%{NAS-IP-Address}' \
 			AND AcctStartTime <= ${...event_timestamp}"
@@ -177,7 +176,6 @@ accounting {
 				FramedInterfaceId, \
 				DelegatedIPv6Prefix, \
 				AcctStartDelay, \
-				AcctStopDelay, \
 				Class) \
 			VALUES(\
 				'%{Acct-Session-Id}', \
@@ -300,7 +298,6 @@ accounting {
 				AcctInputOctets = convert(bigint, '%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}'), \
 				AcctOutputOctets = convert(bigint, '%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}'), \
 				AcctTerminateCause = '%{Acct-Terminate-Cause}', \
-				AcctStopDelay = '%{&Acct-Delay-Time || 0}', \
 				ConnectInfo_stop = '%{Connect-Info}', \
 				Class = '%{Class}' \
 			WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \
@@ -333,7 +330,6 @@ accounting {
 				FramedInterfaceId, \
 				DelegatedIPv6Prefix, \
 				AcctStartDelay, \
-				AcctStopDelay, \
 				Class) \
 			VALUES(\
 				'%{Acct-Session-Id}', \
@@ -362,7 +358,6 @@ accounting {
 				'%{Framed-Interface-Id}', \
 				'%{Delegated-IPv6-Prefix}', \
 				'0', \
-				'%{&Acct-Delay-Time || 0}', \
 				'%{Class}')"
 	}
 }
diff --git a/raddb/mods-config/sql/main/mssql/schema.sql b/raddb/mods-config/sql/main/mssql/schema.sql
index e75ec967109..e72a0171480 100644
--- a/raddb/mods-config/sql/main/mssql/schema.sql
+++ b/raddb/mods-config/sql/main/mssql/schema.sql
@@ -48,7 +48,6 @@ CREATE TABLE [radacct] (
 	[FramedInterfaceId] [varchar] (44) NOT NULL,
 	[DelegatedIPv6Prefix] [varchar] (45) NOT NULL,
 	[AcctStartDelay] [int] NULL,
-	[AcctStopDelay] [int] NULL,
 	[Class] [varchar] (64) NULL
 ) ON [PRIMARY]
 GO
@@ -82,7 +81,6 @@ ALTER TABLE [radacct] WITH NOCHECK ADD
 	CONSTRAINT [DF_radacct_FramedInterfaceId] DEFAULT ('') FOR [FramedInterfaceId],
 	CONSTRAINT [DF_radacct_DelegatedIPv6Prefix] DEFAULT ('') FOR [DelegatedIPv6Prefix],
 	CONSTRAINT [DF_radacct_AcctStartDelay] DEFAULT (null) FOR [AcctStartDelay],
-	CONSTRAINT [DF_radacct_AcctStopDelay] DEFAULT (null) FOR [AcctStopDelay],
 	CONSTRAINT [DF_radacct_Class] DEFAULT (null) FOR [Class],
 	CONSTRAINT [PK_radacct] PRIMARY KEY NONCLUSTERED
 	(
diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf
index d8d8c39cd4d..b5b2f92e90f 100644
--- a/raddb/mods-config/sql/main/oracle/queries.conf
+++ b/raddb/mods-config/sql/main/oracle/queries.conf
@@ -130,12 +130,10 @@ accounting {
 		query = "\
 			UPDATE ${...acct_table1} \
 			SET \
-			AcctStopTime = ${...event_timestamp}, \
+				AcctStopTime = ${...event_timestamp}, \
 				AcctSessionTime = ROUND((${...event_timestamp} - \
 					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}, \
-				Class = '%{Class}' \
+				AcctTerminateCause='%{&Acct-Terminate-Cause || 'NAS-Reboot'}' \
 			WHERE AcctStopTime IS NULL \
 			AND NASIPAddress = '%{NAS-IP-Address}' \
 			AND AcctStartTime <= ${...event_timestamp}"
@@ -184,7 +182,6 @@ accounting {
 				FramedInterfaceId, \
 				DelegatedIPv6Prefix, \
 				AcctStartDelay,	\
-				AcctStopDelay, \
 				Class) \
 			VALUES(\
 				'', \
@@ -214,7 +211,6 @@ accounting {
 				'%{Framed-Interface-Id}', \
 				'%{Delegated-IPv6-Prefix}', \
 				'%{Acct-Delay-Time}', \
-				'0', \
 				'%{Class}')"
 
 		query = "\
@@ -299,7 +295,6 @@ accounting {
 				AcctInputOctets = '%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}', \
 				AcctOutputOctets = '%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}', \
 				AcctTerminateCause = '%{Acct-Terminate-Cause}', \
-				AcctStopDelay = '%{&Acct-Delay-Time || 0}', \
 				ConnectInfo_stop = '%{Connect-Info}', \
 				Class = '%{Class}' \
 			WHERE AcctUniqueId = '%{Acct-Unique-Session-ID}' \
@@ -330,7 +325,6 @@ accounting {
 				FramedProtocol, \
 				FramedIPAddress, \
 				AcctStartDelay,	\
-				AcctStopDelay, \
 				Class) \
 			VALUES(\
 				'', \
diff --git a/raddb/mods-config/sql/main/oracle/schema.sql b/raddb/mods-config/sql/main/oracle/schema.sql
index 73f16579ee2..bb8ce5cadf3 100644
--- a/raddb/mods-config/sql/main/oracle/schema.sql
+++ b/raddb/mods-config/sql/main/oracle/schema.sql
@@ -40,7 +40,6 @@ CREATE TABLE radacct (
 	framedinterfaceid	VARCHAR(44),
 	delegatedipv6prefix	VARCHAR(45),
 	acctstartdelay		NUMERIC(12),
-	acctstopdelay		NUMERIC(12),
 	class 			VARCHAR(64)
 );