Move 'op' column to between Attribue and Value columns and set it to

be 'NOT NULL' to prevent silly problems with users who don't set an
operator.

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql b/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql
index d1f5c3e..e531238 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql
@@ -55,8 +55,8 @@ CREATE TABLE radcheck (
   id int(11) unsigned NOT NULL auto_increment,
   UserName varchar(64) NOT NULL default '',
   Attribute varchar(32)  NOT NULL default '',
+  op char(2) NOT NULL,
   Value varchar(253) NOT NULL default '',
-  op char(2),
   PRIMARY KEY  (id),
   KEY UserName (UserName(32))
 ) ;
@@ -69,8 +69,8 @@ CREATE TABLE radgroupcheck (
   id int(11) unsigned NOT NULL auto_increment,
   GroupName varchar(64) NOT NULL default '',
   Attribute varchar(32)  NOT NULL default '',
+  op char(2) NOT NULL,
   Value varchar(253)  NOT NULL default '',
-  op char(2),
   PRIMARY KEY  (id),
   KEY GroupName (GroupName(32))
 ) ;
@@ -83,8 +83,8 @@ CREATE TABLE radgroupreply (
   id int(11) unsigned NOT NULL auto_increment,
   GroupName varchar(64) NOT NULL default '',
   Attribute varchar(32)  NOT NULL default '',
+  op char(2) NOT NULL,
   Value varchar(253)  NOT NULL default '',
-  op char(2),
   prio int unsigned NOT NULL default '0',
   PRIMARY KEY  (id),
   KEY GroupName (GroupName(32))
@@ -98,8 +98,8 @@ CREATE TABLE radreply (
   id int(11) unsigned NOT NULL auto_increment,
   UserName varchar(64) NOT NULL default '',
   Attribute varchar(32) NOT NULL default '',
+  op char(2) NOT NULL,
   Value varchar(253) NOT NULL default '',
-  op char(2),
   PRIMARY KEY  (id),
   KEY UserName (UserName(32))
 ) ;

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/db_postgresql.sql b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/db_postgresql.sql
index 6e9ac9b..387bb86 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/db_postgresql.sql
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/db_postgresql.sql
@@ -91,8 +91,8 @@ CREATE TABLE radcheck (
   id SERIAL,
   UserName VARCHAR(30) DEFAULT '' NOT NULL,
   Attribute VARCHAR(30),
+  op VARCHAR(2) NOT NULL,
   Value VARCHAR(40),
-  op VARCHAR(2),
   PRIMARY KEY (id)
 );
 create index radcheck_UserName on radcheck (UserName,Attribute);
@@ -104,8 +104,8 @@ CREATE TABLE radgroupcheck (
   id SERIAL,
   GroupName VARCHAR(20) DEFAULT '' NOT NULL,
   Attribute VARCHAR(40),
+  op VARCHAR(2) NOT NULL,
   Value VARCHAR(40),
-  op VARCHAR(2),
   PRIMARY KEY (id)
 );
 create index radgroupcheck_GroupName on radgroupcheck (GroupName,Attribute);
@@ -117,8 +117,8 @@ CREATE TABLE radgroupreply (
   id SERIAL,
   GroupName VARCHAR(20) DEFAULT '' NOT NULL,
   Attribute VARCHAR(40),
+  op VARCHAR(2) NOT NULL,
   Value VARCHAR(40),
-  op VARCHAR(2),
   PRIMARY KEY (id)
 );
 create index radgroupreply_GroupName on radgroupreply (GroupName,Attribute);
@@ -130,8 +130,8 @@ CREATE TABLE radreply (
   id SERIAL,
   UserName VARCHAR(30) DEFAULT '' NOT NULL,
   Attribute VARCHAR(30),
+  op VARCHAR(2) NOT NULL,
   Value VARCHAR(40),
-  op VARCHAR(2),
   PRIMARY KEY (id)
 );
 create index radreply_UserName on radreply (UserName,Attribute);