Enrol/LDAP - DB Patches + version bump

These patches add an 'enrol' column to the user_students and user_teachers tables for the enrolment plugins to be able to keep track of source of the enrolments. Follows similar conventions to the user table with its 'auth' field.

This is a merge of the following patches:
 arch-eduforge@catalyst.net.nz--2004/moodle--eduforge--1.3.3--patch-187
 arch-eduforge@catalyst.net.nz--2004/moodle--eduforge--1.3.3--patch-192

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 9f87359d488842db9afa0bdeab207d08752ca9de..20765236992688539e1b32ef070dd1d3b08bf44b 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -969,7 +969,12 @@ function main_upgrade($oldversion=0) {
         modify_database('','ALTER TABLE `prefix_user` ADD INDEX prefix_user_email_idx (email);');
     }
 
-    
+    if ($oldversion < 2004112200) { // new 'enrol' field for enrolment tables
+        table_column('user_students', '', 'enrol', 'varchar', '20', '', '', 'not null');
+        table_column('user_teachers', '', 'enrol', 'varchar', '20', '', '', 'not null');
+        execute_sql("ALTER TABLE `{$CFG->prefix}user_students` ADD INDEX enrol (enrol);");
+        execute_sql("ALTER TABLE `{$CFG->prefix}user_teachers` ADD INDEX enrol (enrol);");
+    }
     
     return $result;
 

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 09f2daf0da8d00a1a92b5be28849cc830b42f9fe..e85a028e2802e5d6e86d79ddc80072c27a9c4dd5 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -428,10 +428,12 @@ CREATE TABLE `prefix_user_students` (
   `timeend` int(10) unsigned NOT NULL default '0',
   `time` int(10) unsigned NOT NULL default '0',
   `timeaccess` int(10) unsigned NOT NULL default '0',
+  `enrol` varchar(20) NOT NULL default '',  
   PRIMARY KEY  (`id`),
   UNIQUE KEY `id` (`id`),
   KEY `courseuserid` (course,userid),
   KEY `userid` (userid),
+  KEY `enrol` (enrol),
   KEY `timeaccess` (timeaccess)
 ) TYPE=MyISAM;
 # --------------------------------------------------------

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 9e6d01a2a30781d1d79ec20f439234424bf6bf8e..1f42ea2380c7eedd0bafed8ce3ff0af3b8b40f47 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -709,7 +709,13 @@ function main_upgrade($oldversion=0) {
 
         modify_database('','CREATE INDEX prefix_user_email_idx ON prefix_user (email);');
      }
- 
+
+    if ($oldversion < 2004112200) { // new 'enrol' field for enrolment tables
+        table_column('user_students', '', 'enrol', 'varchar', '20', '', '', 'not null');
+        table_column('user_teachers', '', 'enrol', 'varchar', '20', '', '', 'not null');
+        modify_database("","CREATE INDEX {$CFG->prefix}user_students_enrol_idx ON {$CFG->prefix}user_students (enrol);");
+        modify_database("","CREATE INDEX {$CFG->prefix}user_teachers_enrolidx ON {$CFG->prefix}user_teachers (enrol);");
+    } 
     return $result;
 }
 

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index ebc0b9c52685395331eaa38940982cc60e6f0100..6418669f83a0bedf8a818acec30fca5694105a15 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -293,11 +293,13 @@ CREATE TABLE prefix_user_students (
    timestart integer NOT NULL default '0',
    timeend integer NOT NULL default '0',
    time integer NOT NULL default '0',
-   timeaccess integer NOT NULL default '0'
+   timeaccess integer NOT NULL default '0',
+   enrol varchar (20) NOT NULL default ''
 );
 
 CREATE INDEX prefix_user_students_courseuserid_idx ON prefix_user_students (course,userid);
 CREATE INDEX prefix_user_students_userid_idx ON prefix_user_students (userid);
+CREATE INDEX prefix_user_students_enrol_idx ON prefix_user_students (enrol);
 
 CREATE TABLE prefix_user_teachers (
    id SERIAL PRIMARY KEY,
@@ -309,11 +311,13 @@ CREATE TABLE prefix_user_teachers (
    timestart integer NOT NULL default '0',
    timeend integer NOT NULL default '0',
    timemodified integer NOT NULL default '0',
-   timeaccess integer NOT NULL default '0'
+   timeaccess integer NOT NULL default '0',
+   enrol varchar (20) NOT NULL default ''
 );
 
 CREATE INDEX prefix_user_teachers_courseuserid_idx ON prefix_user_teachers (course,userid);
 CREATE INDEX prefix_user_teachers_userid_idx ON prefix_user_teachers (userid);
+CREATE INDEX prefix_user_teachers_enrol_idx ON prefix_user_teachers (enrol);
 
 CREATE TABLE prefix_user_coursecreators (
    id SERIAL8 PRIMARY KEY,

diff --git a/version.php b/version.php
index b52437db3132437f6d92a29792701878c9ab851a..6590a19c78c072c4a4c78a7298da376616f95220 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine 
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2004111700;  // YYYYMMDD = date of first major branch release 1.4
+   $version = 2004112200;  // YYYYMMDD = date of first major branch release 1.4
                            //       XY = increments within a single day
 
    $release = '1.5 UNSTABLE DEVELOPMENT';    // Human-friendly version name