From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Tue, 4 Dec 2018 13:29:46 +0000 (+0000)
Subject: small sql schema fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb15efe88b1f06fed89fc7225cd24ceea52dbbbf;p=thirdparty%2Ffreeradius-server.git

small sql schema fixes
---

diff --git a/raddb/mods-config/sql/main/mssql/schema.sql b/raddb/mods-config/sql/main/mssql/schema.sql
index 7a54f76dd1e..22eec1064ec 100644
--- a/raddb/mods-config/sql/main/mssql/schema.sql
+++ b/raddb/mods-config/sql/main/mssql/schema.sql
@@ -38,10 +38,10 @@ CREATE TABLE [radacct] (
 	[ServiceType] [varchar] (32) NULL ,
 	[FramedProtocol] [varchar] (32) NULL ,
 	[FramedIPAddress] [varchar] (15) DEFAULT ('') FOR [FramedIPAddress],
-	[FramedIPv6Address] [varchar] (44) DEFAULT ('') FOR [FramedIPv6Address],
-	[FramedIPv6Prefix] [varchar] (44) DEFAULT ('') FOR [FramedIPv6Prefix],
+	[FramedIPv6Address] [varchar] (45) DEFAULT ('') FOR [FramedIPv6Address],
+	[FramedIPv6Prefix] [varchar] (45) DEFAULT ('') FOR [FramedIPv6Prefix],
 	[FramedInterfaceId] [varchar] (44) DEFAULT ('') FOR [FramedInterfaceId],
-	[DelegatedIPv6Prefix] [varchar] (44) DEFAULT ('') FOR [DelegatedIPv6Prefix],
+	[DelegatedIPv6Prefix] [varchar] (45) DEFAULT ('') FOR [DelegatedIPv6Prefix],
 	[XAscendSessionSvrKey] [varchar] (10) DEFAULT (null) FOR [XAscendSessionSvrKey],
 	[AcctStartDelay] [int] NULL ,
 	[AcctStopDelay] [int] NULL
diff --git a/raddb/mods-config/sql/main/mysql/schema.sql b/raddb/mods-config/sql/main/mysql/schema.sql
index d7f8b7d7155..b5ec31a1028 100644
--- a/raddb/mods-config/sql/main/mysql/schema.sql
+++ b/raddb/mods-config/sql/main/mysql/schema.sql
@@ -40,10 +40,10 @@ CREATE TABLE radacct (
   servicetype varchar(32) default NULL,
   framedprotocol varchar(32) default NULL,
   framedipaddress varchar(15) NOT NULL default '',
-  framedipv6address varchar(44) NOT NULL default '',
-  framedipv6prefix varchar(44) NOT NULL default '',
+  framedipv6address varchar(45) NOT NULL default '',
+  framedipv6prefix varchar(45) NOT NULL default '',
   framedinterfaceid varchar(44) NOT NULL default '',
-  delegatedipv6prefix varchar(44) NOT NULL default '',
+  delegatedipv6prefix varchar(45) NOT NULL default '',
   PRIMARY KEY (radacctid),
   UNIQUE KEY acctuniqueid (acctuniqueid),
   KEY username (username),
diff --git a/raddb/mods-config/sql/main/ndb/schema.sql b/raddb/mods-config/sql/main/ndb/schema.sql
index 089d7b54e10..ed9e044f778 100644
--- a/raddb/mods-config/sql/main/ndb/schema.sql
+++ b/raddb/mods-config/sql/main/ndb/schema.sql
@@ -30,7 +30,7 @@ CREATE TABLE radacct (
   acctupdatetime datetime NULL default NULL,
   acctstoptime datetime NULL default NULL,
   acctinterval int(12) default NULL,
-  acctsessiontime int(12) default NULL,
+  acctsessiontime int(12) unsigned default NULL,
   acctauthentic varchar(32) default NULL,
   connectinfo_start varchar(50) default NULL,
   connectinfo_stop varchar(50) default NULL,
@@ -42,11 +42,11 @@ CREATE TABLE radacct (
   servicetype varchar(32) default NULL,
   framedprotocol varchar(32) default NULL,
   framedipaddress varchar(15) NOT NULL default '',
-  framedipv6address varchar(44) NOT NULL default '',
-  framedipv6prefix varchar(44) NOT NULL default '',
+  framedipv6address varchar(45) NOT NULL default '',
+  framedipv6prefix varchar(45) NOT NULL default '',
   framedinterfaceid varchar(44) NOT NULL default '',
-  delegatedipv6prefix varchar(44) NOT NULL default '',
-  PRIMARY KEY  (radacctid),
+  delegatedipv6prefix varchar(45) NOT NULL default '',
+  PRIMARY KEY (radacctid),
   UNIQUE KEY acctuniqueid (acctuniqueid),
   KEY username (username),
   KEY framedipaddress (framedipaddress),
@@ -57,6 +57,7 @@ CREATE TABLE radacct (
   KEY acctsessionid (acctsessionid),
   KEY acctsessiontime (acctsessiontime),
   KEY acctstarttime (acctstarttime),
+  KEY acctinterval (acctinterval),
   KEY acctstoptime (acctstoptime),
   KEY nasipaddress (nasipaddress),
   INDEX bulk_close (acctstoptime, nasipaddress, acctstarttime)
diff --git a/raddb/mods-config/sql/main/oracle/schema.sql b/raddb/mods-config/sql/main/oracle/schema.sql
index e6b502d53fc..d603915bea8 100644
--- a/raddb/mods-config/sql/main/oracle/schema.sql
+++ b/raddb/mods-config/sql/main/oracle/schema.sql
@@ -34,10 +34,10 @@ CREATE TABLE radacct (
 	servicetype		VARCHAR(32),
 	framedprotocol		VARCHAR(32),
 	framedipaddress		VARCHAR(15),
-	framedipv6address	VARCHAR(44),
-	framedipv6prefix	VARCHAR(44),
+	framedipv6address	VARCHAR(45),
+	framedipv6prefix	VARCHAR(45),
 	framedinterfaceid	VARCHAR(44),
-	delegatedipv6prefix	VARCHAR(44),
+	delegatedipv6prefix	VARCHAR(45),
 	acctstartdelay		NUMERIC(12),
 	acctstopdelay		NUMERIC(12),
 	XAscendSessionSvrKey	VARCHAR(10)
diff --git a/raddb/mods-config/sql/main/postgresql/schema.sql b/raddb/mods-config/sql/main/postgresql/schema.sql
index 29ef0766c47..7abd524d38e 100644
--- a/raddb/mods-config/sql/main/postgresql/schema.sql
+++ b/raddb/mods-config/sql/main/postgresql/schema.sql
@@ -41,7 +41,7 @@ CREATE TABLE radacct (
 	FramedIPAddress		inet,
 	FramedIPv6Address	inet,
 	FramedIPv6Prefix	inet,
-	FramedInterfaceId	inet,
+	FramedInterfaceId	text,
 	DelegatedIPv6Prefix	inet
 );
 -- This index may be useful..
diff --git a/raddb/mods-config/sql/main/sqlite/schema.sql b/raddb/mods-config/sql/main/sqlite/schema.sql
index 28916d266a5..9b23ebc3c5a 100644
--- a/raddb/mods-config/sql/main/sqlite/schema.sql
+++ b/raddb/mods-config/sql/main/sqlite/schema.sql
@@ -36,10 +36,10 @@ CREATE TABLE radacct (
 	servicetype varchar(32) default NULL,
 	framedprotocol varchar(32) default NULL,
 	framedipaddress varchar(15) NOT NULL default '',
-	framedipv6address varchar(44) NOT NULL default '',
-	framedipv6prefix varchar(44) NOT NULL default '',
+	framedipv6address varchar(45) NOT NULL default '',
+	framedipv6prefix varchar(45) NOT NULL default '',
 	framedinterfaceid varchar(44) NOT NULL default '',
-	delegatedipv6prefix varchar(44) NOT NULL default ''
+	delegatedipv6prefix varchar(45) NOT NULL default ''
 );
 
 CREATE UNIQUE INDEX acctuniqueid ON radacct(acctuniqueid);