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:
 [email protected]/moodle--eduforge--1.3.3--patch-187
 [email protected]/moodle--eduforge--1.3.3--patch-192
This commit is contained in:
martinlanghoff
2004-11-22 02:36:14 +00:00
parent 4f3fecf4a6
commit 5cd796869e
5 changed files with 22 additions and 5 deletions
+6 -1
View File
@@ -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;
+2
View File
@@ -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;
# --------------------------------------------------------
+7 -1
View File
@@ -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;
}
+6 -2
View File
@@ -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,
+1 -1
View File
@@ -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