From f75d0a479cbb034455966aeed36f06a28df39d6b Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Wed, 17 Nov 2004 22:11:52 +0000 Subject: [PATCH] Merged from MOODLE_14_STABLE: Indexes and version bump for attendance --- mod/attendance/db/mysql.php | 14 +++++++++----- mod/attendance/db/mysql.sql | 7 +++++-- mod/attendance/db/postgres7.php | 10 ++++++++++ mod/attendance/db/postgres7.sql | 5 +++++ mod/attendance/version.php | 2 +- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/mod/attendance/db/mysql.php b/mod/attendance/db/mysql.php index 0e0812fe8a..1feaea73e6 100644 --- a/mod/attendance/db/mysql.php +++ b/mod/attendance/db/mysql.php @@ -40,11 +40,15 @@ function attendance_upgrade($oldversion) { } - - - - - + if ($oldversion < 2004111200) { + execute_sql('ALTER TABLE prefix_attendance DROP INDEX course;',false); + execute_sql('ALTER TABLE prefix_attendance_roll DROP INDEX dayid;',false); + execute_sql('ALTER TABLE prefix_attendance_roll DROP INDEX userid;',false); + + modify_database('','ALTER TABLE prefix_attendance ADD INDEX course (course);'); + modify_database('','ALTER TABLE prefix_attendance_roll ADD INDEX dayid (dayid);'); + modify_database('','ALTER TABLE prefix_attendance_roll ADD INDEX userid (userid);'); + } return true; diff --git a/mod/attendance/db/mysql.sql b/mod/attendance/db/mysql.sql index ae70033f73..8526c7f238 100755 --- a/mod/attendance/db/mysql.sql +++ b/mod/attendance/db/mysql.sql @@ -14,7 +14,8 @@ CREATE TABLE prefix_attendance ( dynsection tinyint(1) NOT NULL default '0', edited tinyint(1) NOT NULL default '0', autoattend tinyint(1) NOT NULL default '0', - PRIMARY KEY (id) + PRIMARY KEY (id), + KEY `course` (`course`) ) TYPE=MyISAM; # @@ -28,7 +29,9 @@ CREATE TABLE prefix_attendance_roll ( hour tinyint(1) unsigned NOT NULL default '0', status int(11) NOT NULL default '0', notes varchar(64) NOT NULL default '', - PRIMARY KEY (id) + PRIMARY KEY (id), + KEY `dayid` (`dayid`), + KEY `userid` (`userid`) ) TYPE=MyISAM; INSERT INTO prefix_log_display VALUES ('attendance', 'view', 'attendance', 'name'); INSERT INTO prefix_log_display VALUES ('attendance', 'view', 'attendance', 'name'); diff --git a/mod/attendance/db/postgres7.php b/mod/attendance/db/postgres7.php index 7d27bc55bf..dcecd28cea 100644 --- a/mod/attendance/db/postgres7.php +++ b/mod/attendance/db/postgres7.php @@ -30,6 +30,16 @@ function attendance_upgrade($oldversion) { + if ($oldversion < 2004111200) { + execute_sql('DROP INDEX prefix_attendance_course_idx;',false); + execute_sql('DROP INDEX prefix_attendance_roll_dayid_idx;',false); + execute_sql('DROP INDEX prefix_attendance_roll_userid_idx;',false); + + modify_database('','CREATE INDEX prefix_attendance_course_idx ON prefix_attendance (course);'); + modify_database('','CREATE INDEX prefix_attendance_roll_dayid_idx ON prefix_attendance_roll (dayid);'); + modify_database('','CREATE INDEX prefix_attendance_roll_userid_idx ON prefix_attendance_roll (userid);'); + } + return true; } diff --git a/mod/attendance/db/postgres7.sql b/mod/attendance/db/postgres7.sql index 2db7ff5689..b9d0180c93 100644 --- a/mod/attendance/db/postgres7.sql +++ b/mod/attendance/db/postgres7.sql @@ -17,6 +17,8 @@ CREATE TABLE prefix_attendance ( PRIMARY KEY(id) ); +CREATE INDEX prefix_attendance_course_idx ON prefix_attendance (course); + # # Table structure for table `prefix_attendance_roll` # @@ -31,6 +33,9 @@ CREATE TABLE prefix_attendance_roll ( PRIMARY KEY (id) ); +CREATE INDEX prefix_attendance_roll_dayid_idx ON prefix_attendance_roll (dayid); +CREATE INDEX prefix_attendance_roll_userid_idx ON prefix_attendance_roll (userid); + INSERT INTO prefix_log_display VALUES ('attendance', 'view', 'attendance', 'name'); INSERT INTO prefix_log_display VALUES ('attendance', 'view', 'attendance', 'name'); INSERT INTO prefix_log_display VALUES ('attendance', 'viewall', 'attendance', 'name'); diff --git a/mod/attendance/version.php b/mod/attendance/version.php index 8b87c48a3d..a9084682b4 100644 --- a/mod/attendance/version.php +++ b/mod/attendance/version.php @@ -5,7 +5,7 @@ /// This fragment is called by moodle_needs_upgrading() and /admin/index.php ///////////////////////////////////////////////////////////////////////////////// -$module->version = 2004060400; // The current module version (Date: YYYYMMDDXX) +$module->version = 2004111200; // The current module version (Date: YYYYMMDDXX) $module->requires = 2004052505; // Requires this Moodle version $module->cron = 3600; // Period for cron to check this module (secs) -- 2.39.5