From: Jorge Pereira <jpereira@users.noreply.github.com>
Date: Thu, 13 May 2021 15:16:35 +0000 (-0300)
Subject: Add new 'Class' column into post-auth / SQL schemas (#4071)
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aebd02c61fa762f564f86c46f5af2f783a861c37;p=thirdparty%2Ffreeradius-server.git

Add new 'Class' column into post-auth / SQL schemas (#4071)
---

diff --git a/raddb/mods-config/sql/main/cassandra/queries.conf b/raddb/mods-config/sql/main/cassandra/queries.conf
index 5a9267fd7fa..f15d4d3f74a 100644
--- a/raddb/mods-config/sql/main/cassandra/queries.conf
+++ b/raddb/mods-config/sql/main/cassandra/queries.conf
@@ -365,10 +365,11 @@ post-auth {
 
 	query =	"\
 		INSERT INTO ${..postauth_table} \
-			(username, pass, reply, authdate) \
+			(username, pass, reply, authdate, class) \
 		VALUES ( \
 			'%{SQL-User-Name}', \
 			'%{%{User-Password}:-%{Chap-Password}}', \
 			'%{reply.Packet-Type}', \
-			'%{expr:%l * 1000 + %M / 1000}')"
+			'%{expr:%l * 1000 + %M / 1000}', \
+			'%{reply.Class}')"
 }
diff --git a/raddb/mods-config/sql/main/cassandra/schema.sql b/raddb/mods-config/sql/main/cassandra/schema.sql
index d97b77366e2..90a5b0b723e 100644
--- a/raddb/mods-config/sql/main/cassandra/schema.sql
+++ b/raddb/mods-config/sql/main/cassandra/schema.sql
@@ -71,6 +71,7 @@ CREATE TABLE radpostauth (
   pass text,
   reply text,
   authdate timestamp,
+  class text,
   PRIMARY KEY (username, authdate)
 ) WITH CLUSTERING ORDER BY (authdate ASC);
 
diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf
index ed4421ff519..8eac4177cbe 100644
--- a/raddb/mods-config/sql/main/mssql/queries.conf
+++ b/raddb/mods-config/sql/main/mssql/queries.conf
@@ -366,10 +366,11 @@ post-auth {
 
 	query = "\
 		INSERT INTO ${..postauth_table} \
-			(userName, pass, reply, authdate) \
+			(userName, pass, reply, authdate, class) \
 		VALUES(\
 			'%{User-Name}', \
 			'%{%{User-Password}:-CHAP-PASSWORD}', \
 			'%{reply.Packet-Type}', \
-			'%S.%{expr:%M / 1000}')"
+			'%S.%{expr:%M / 1000}', \
+			'%{reply.Class}')"
 }
diff --git a/raddb/mods-config/sql/main/mssql/schema.sql b/raddb/mods-config/sql/main/mssql/schema.sql
index 3361015685d..7eeb61ff4a9 100644
--- a/raddb/mods-config/sql/main/mssql/schema.sql
+++ b/raddb/mods-config/sql/main/mssql/schema.sql
@@ -276,7 +276,8 @@ CREATE TABLE [radpostauth] (
 	[userName] [varchar] (64) NOT NULL ,
 	[pass] [varchar] (64) NOT NULL ,
 	[reply] [varchar] (32) NOT NULL ,
-	[authdate] [datetime] NOT NULL
+	[authdate] [datetime] NOT NULL,
+	[class] [varchar] (64) NULL
 )
 GO
 
@@ -285,6 +286,7 @@ ALTER TABLE [radpostauth] WITH NOCHECK ADD
 	CONSTRAINT [DF_radpostauth_pass] DEFAULT ('') FOR [pass],
 	CONSTRAINT [DF_radpostauth_reply] DEFAULT ('') FOR [reply],
 	CONSTRAINT [DF_radpostauth_authdate] DEFAULT (getdate()) FOR [authdate],
+	CONSTRAINT [DF_radpostauth_class] DEFAULT ('') FOR [class],
 	CONSTRAINT [PK_radpostauth] PRIMARY KEY NONCLUSTERED
 	(
 		[id]
diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index 8f4625aec12..0a6a0e1b8f6 100644
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -396,10 +396,11 @@ post-auth {
 
 	query =	"\
 		INSERT INTO ${..postauth_table} \
-			(username, pass, reply, authdate) \
+			(username, pass, reply, authdate, class) \
 		VALUES ( \
 			'%{SQL-User-Name}', \
 			'%{%{User-Password}:-%{Chap-Password}}', \
 			'%{reply.Packet-Type}', \
-			'%S.%M')"
+			'%S.%M', \
+			'%{reply.Class}')"
 }
diff --git a/raddb/mods-config/sql/main/mysql/schema.sql b/raddb/mods-config/sql/main/mysql/schema.sql
index 2fa9f5888d7..a2053cfb718 100644
--- a/raddb/mods-config/sql/main/mysql/schema.sql
+++ b/raddb/mods-config/sql/main/mysql/schema.sql
@@ -147,6 +147,7 @@ CREATE TABLE radpostauth (
   pass varchar(64) NOT NULL default '',
   reply varchar(32) NOT NULL default '',
   authdate timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
+  class varchar(64) NOT NULL default '',
   PRIMARY KEY  (id)
 ) ENGINE = INNODB;
 
diff --git a/raddb/mods-config/sql/main/ndb/schema.sql b/raddb/mods-config/sql/main/ndb/schema.sql
index 2897494ce17..22b95f7d99e 100644
--- a/raddb/mods-config/sql/main/ndb/schema.sql
+++ b/raddb/mods-config/sql/main/ndb/schema.sql
@@ -141,5 +141,6 @@ CREATE TABLE radpostauth (
   pass varchar(64) NOT NULL default '',
   reply varchar(32) NOT NULL default '',
   authdate timestamp NOT NULL,
+  class varchar(64) NOT NULL default '',
   PRIMARY KEY  (id)
 ) ENGINE=ndbcluster;
diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf
index 7be44903262..df77a5718f9 100644
--- a/raddb/mods-config/sql/main/oracle/queries.conf
+++ b/raddb/mods-config/sql/main/oracle/queries.conf
@@ -419,10 +419,11 @@ post-auth {
 #	logfile = ${logdir}/post-auth.sql
 	query = "\
 		INSERT INTO ${..postauth_table} \
-			(username, pass, reply, authdate) \
+			(username, pass, reply, authdate, class) \
 		VALUES (\
 			'%{User-Name}', \
 			'%{%{User-Password}:-%{Chap-Password}}', \
 			'%{reply.Packet-Type}', \
-			TO_TIMESTAMP('%S.%M','YYYY-MM-DDHH24:MI:SS.FF'))"
+			TO_TIMESTAMP('%S.%M','YYYY-MM-DDHH24:MI:SS.FF'), \
+			'%{reply.Class}')"
 }
diff --git a/raddb/mods-config/sql/main/oracle/schema.sql b/raddb/mods-config/sql/main/oracle/schema.sql
index 7cda4fef308..c049bd9686d 100644
--- a/raddb/mods-config/sql/main/oracle/schema.sql
+++ b/raddb/mods-config/sql/main/oracle/schema.sql
@@ -207,7 +207,8 @@ CREATE TABLE radpostauth (
 	  UserName      VARCHAR(64) NOT NULL,
 	  Pass          VARCHAR(64),
 	  Reply         VARCHAR(64),
-	  AuthDate 	TIMESTAMP(6) WITH TIME ZONE
+	  AuthDate 	TIMESTAMP(6) WITH TIME ZONE,
+	  Class         VARCHAR(64),
 );
 
 CREATE SEQUENCE radpostauth_seq START WITH 1 INCREMENT BY 1;
diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index 86a3ba1387d..e6d770b1e0a 100644
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -469,10 +469,11 @@ post-auth {
 
 	query = "\
 		INSERT INTO ${..postauth_table} \
-			(username, pass, reply, authdate) \
+			(username, pass, reply, authdate, class) \
 		VALUES(\
 			'%{User-Name}', \
 			'%{%{User-Password}:-Chap-Password}', \
 			'%{reply.Packet-Type}', \
-			'%S.%M')"
+			'%S.%M', \
+			'%{reply.Class}')"
 }
diff --git a/raddb/mods-config/sql/main/postgresql/schema.sql b/raddb/mods-config/sql/main/postgresql/schema.sql
index 9a73c7cbbff..c88af7f66f3 100644
--- a/raddb/mods-config/sql/main/postgresql/schema.sql
+++ b/raddb/mods-config/sql/main/postgresql/schema.sql
@@ -152,7 +152,8 @@ CREATE TABLE radpostauth (
 	reply			text,
 	CalledStationId		text,
 	CallingStationId	text,
-	authdate		timestamp with time zone NOT NULL default now()
+	authdate		timestamp with time zone NOT NULL default now(),
+	Class			text,
 );
 
 --
diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index e3abb905c09..3a5bfd6245a 100644
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -412,10 +412,11 @@ post-auth {
 
 	query =	"\
 		INSERT INTO ${..postauth_table} \
-			(username, pass, reply, authdate) \
+			(username, pass, reply, authdate, class) \
 		VALUES ( \
 			'%{SQL-User-Name}', \
 			'%{%{User-Password}:-%{Chap-Password}}', \
 			'%{reply.Packet-Type}', \
-			'%S.%M')"
+			'%S.%M', \
+			'%{reply.Class}')"
 }
diff --git a/raddb/mods-config/sql/main/sqlite/schema.sql b/raddb/mods-config/sql/main/sqlite/schema.sql
index 790ce2d9121..1e85f13222a 100644
--- a/raddb/mods-config/sql/main/sqlite/schema.sql
+++ b/raddb/mods-config/sql/main/sqlite/schema.sql
@@ -127,7 +127,8 @@ CREATE TABLE radpostauth (
 	username varchar(64) NOT NULL default '',
 	pass varchar(64) NOT NULL default '',
 	reply varchar(32) NOT NULL default '',
-	authdate timestamp NOT NULL
+	authdate timestamp NOT NULL,
+	class varchar(64) NOT NULL default ''
 );
 
 --