Remove dictionary tables from Oracle and Postgres.

Add naslocation fiel to nas table in oracle

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/db_oracle.sql b/src/modules/rlm_sql/drivers/rlm_sql_oracle/db_oracle.sql
index 2b481d2..b5357e1 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/db_oracle.sql
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/db_oracle.sql
@@ -8,19 +8,6 @@
  */
 
 /*
- * Table structure for table 'dictionary'
- */
-CREATE TABLE dictionary (
-       id              INT PRIMARY KEY,
-       type            VARCHAR(30),
-       attribute       VARCHAR(32),
-       value           VARCHAR(32),
-       format          VARCHAR(20),
-       vendor          VARCHAR(32)
-);
-CREATE SEQUENCE dictionary_seq START WITH 1 INCREMENT BY 1;
-
-/*
  * Table structure for table 'nas'
  */
 CREATE TABLE nas (
@@ -32,7 +19,8 @@ CREATE TABLE nas (
        ports           INT,
        secret          VARCHAR(60),
        community       VARCHAR(50),
-       snmp            VARCHAR(10)
+       snmp            VARCHAR(10),
+       naslocation     VARCHAR(10)
 );
 CREATE SEQUENCE nas_seq START WITH 1 INCREMENT BY 1;
 

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 4cf2f19..af19752 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
@@ -1,32 +1,4 @@
 /*
- * --- David Nicklay [ Wed Nov  3 23:18:46 EST 1999 ]
- * 
- */
-
-/*
- * - Postgres wants C style comments.
- * - datetimeOS DEFAULT '0000-00-00 00:00:00' should be
- *   DEFAULT now() in postgres
- * - postgres apparently creates an index for each
- *   column specified as UNIQUE 
- *   Consider implicit creation of <tablename_id_seq> for each SERIAL field!
- */
-
-
-
-/*
- * Table structure for table 'dictionary'
- */
-CREATE TABLE dictionary (
-  id SERIAL PRIMARY KEY,
-  Type VARCHAR(30),
-  Attribute VARCHAR(32),
-  Value VARCHAR(32),
-  Format VARCHAR(20),
-  Vendor VARCHAR(32)
-);
-
-/*
  * Table structure for table 'nas'
  * This is not currently used but FreeRADIUS but is usefull for reporting
  * anyway.