Skip to content

Commit

Permalink
Indexes for workshop and version bump (honoring partial freeze)
Browse files Browse the repository at this point in the history
  • Loading branch information
mjollnir_ committed Nov 21, 2004
1 parent c26fdb8 commit 9958e23
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 8 deletions.
17 changes: 17 additions & 0 deletions mod/workshop/db/mysql.php
View file
Expand Up @@ -81,6 +81,23 @@ function workshop_upgrade($oldversion) {
workshop_refresh_events();
}

if ($oldversion < 2004060401) {
modify_database('','ALTER TABLE prefix_workshop ADD INDEX course (course);');
modify_database('','ALTER TABLE prefix_workshop_assessments ADD INDEX userid (userid);');
modify_database('','ALTER TABLE prefix_workshop_assessments ADD INDEX workshopid (workshopid);');
modify_database('','ALTER TABLE prefix_workshop_assessments ADD INDEX submissionid (submissionid);');
modify_database('','ALTER TABLE prefix_workshop_assessments ADD INDEX mailed (mailed);');
modify_database('','ALTER TABLE prefix_workshop_comments ADD INDEX workshopid (workshopid);');
modify_database('','ALTER TABLE prefix_workshop_comments ADD INDEX assessmentid (assessmentid);');
modify_database('','ALTER TABLE prefix_workshop_comments ADD INDEX userid (userid);');
modify_database('','ALTER TABLE prefix_workshop_comments ADD INDEX mailed (mailed);');
modify_database('','ALTER TABLE prefix_workshop_elements ADD INDEX workshopid (workshopid);');
modify_database('','ALTER TABLE prefix_workshop_grades ADD INDEX workshopid (workshopid);');
modify_database('','ALTER TABLE prefix_workshop_grades ADD INDEX assessmentid (assessmentid);');
modify_database('','ALTER TABLE prefix_workshop_submissions ADD INDEX workshopid (workshopid);');
modify_database('','ALTER TABLE prefix_workshop_submissions ADD INDEX userid (userid);');
modify_database('','ALTER TABLE prefix_workshop_submissions ADD INDEX mailed (mailed);');
}

return true;
}
Expand Down
27 changes: 21 additions & 6 deletions mod/workshop/db/mysql.sql
View file
Expand Up @@ -33,7 +33,8 @@ CREATE TABLE `prefix_workshop` (
`teacherloading` tinyint(3) unsigned NOT NULL default '5',
`assessmentstodrop` tinyint(3) unsigned NOT NULL default '0',
`showleaguetable` tinyint(3) unsigned NOT NULL default '0',
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `course` (`course`)
) COMMENT='Defines workshop';
# --------------------------------------------------------

Expand All @@ -55,7 +56,10 @@ CREATE TABLE `prefix_workshop_submissions` (
`gradinggrade` int(3) unsigned NOT NULL default '0',
`finalgrade` int(3) unsigned NOT NULL default '0',
PRIMARY KEY (`id`),
INDEX `title` (`title`)
INDEX `title` (`title`) ,
INDEX `workshopid` (`workshopid`),
INDEX `userid` (`userid`),
INDEX `mailed` (`mailed`)
) COMMENT='Info about submitted work from teacher and students';
# --------------------------------------------------------

Expand All @@ -78,7 +82,11 @@ CREATE TABLE `prefix_workshop_assessments` (
`donotuse` tinyint(3) unsigned NOT NULL default '0',
`generalcomment` text NOT NULL,
`teachercomment` text NOT NULL,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `workshopid` (`workshopid`),
KEY `submissionid` (`submissionid`),
KEY `userid` (`userid`),
KEY `mailed` (`mailed`)
) COMMENT='Info about assessments by teacher and students';
# --------------------------------------------------------

Expand All @@ -94,7 +102,8 @@ CREATE TABLE `prefix_workshop_elements` (
`scale` tinyint(3) unsigned NOT NULL default '0',
`maxscore` tinyint(3) unsigned NOT NULL default '1',
`weight` float NOT NULL default '1.0',
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `workshopid` (`workshopid`)
) COMMENT='Info about marking scheme of assignment';
# --------------------------------------------------------

Expand Down Expand Up @@ -124,7 +133,9 @@ CREATE TABLE `prefix_workshop_grades` (
`elementno` int(10) unsigned NOT NULL default '0',
`feedback` text NOT NULL default '',
`grade` tinyint(3) NOT NULL default '0',
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `workshopid` (`workshopid`),
KEY `assessmentid` (`assessmentid`)
) COMMENT='Info about individual grades given to each element';
# --------------------------------------------------------

Expand All @@ -140,7 +151,11 @@ CREATE TABLE `prefix_workshop_comments` (
`timecreated` int(10) unsigned NOT NULL default '0',
`mailed` tinyint(2) unsigned NOT NULL default '0',
`comments` text NOT NULL,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `workshopid` (`workshopid`),
KEY `assessmentid` (`assessmentid`),
KEY `userid` (`userid`),
KEY `mailed` (`mailed`)
) COMMENT='Defines comments';
# --------------------------------------------------------

Expand Down
21 changes: 20 additions & 1 deletion mod/workshop/db/postgres7.php
View file
Expand Up @@ -23,12 +23,31 @@ function workshop_upgrade($oldversion) {
)
");
}
return true;

if ($oldversion < 2004052100) {
include_once("$CFG->dirroot/mod/workshop/lib.php");
workshop_refresh_events();
}
if ($oldversion < 2004060401) {
modify_database('','CREATE INDEX prefix_workshop_course_idx ON prefix_workshop (course);');
modify_database('','CREATE INDEX prefix_workshop_assessments_workshopid_idx ON prefix_workshop_assessments (workshopid);');
modify_database('','CREATE INDEX prefix_workshop_assessments_submissionid_idx ON prefix_workshop_assessments (submissionid);');
modify_database('','CREATE INDEX prefix_workshop_assessments_userid_idx ON prefix_workshop_assessments (userid);');
modify_database('','CREATE INDEX prefix_workshop_assessments_mailed_idx ON prefix_workshop_assessments (mailed);');
modify_database('','CREATE INDEX prefix_workshop_comments_workshopid_idx ON prefix_workshop_comments (workshopid);');
modify_database('','CREATE INDEX prefix_workshop_comments_assessmentid_idx ON prefix_workshop_comments (assessmentid);');
modify_database('','CREATE INDEX prefix_workshop_comments_userid_idx ON prefix_workshop_comments (userid);');
modify_database('','CREATE INDEX prefix_workshop_comments_mailed_idx ON prefix_workshop_comments (mailed);');
modify_database('','CREATE INDEX prefix_workshop_elements_workshopid_idx ON prefix_workshop_elements (workshopid);');
modify_database('','CREATE INDEX prefix_workshop_grades_workshopid_idx ON prefix_workshop_grades (workshopid);');
modify_database('','CREATE INDEX prefix_workshop_grades_assessmentid_idx ON prefix_workshop_grades (assessmentid);');
modify_database('','CREATE INDEX prefix_workshop_submissions_workshopid_idx ON prefix_workshop_submissions (workshopid);');
modify_database('','CREATE INDEX prefix_workshop_submissions_userid_idx ON prefix_workshop_submissions (userid);');
modify_database('','CREATE INDEX prefix_workshop_submissions_mailed_idx ON prefix_workshop_submissions (mailed);');
}

return true;

}


Expand Down
24 changes: 24 additions & 0 deletions mod/workshop/db/postgres7.sql
View file
Expand Up @@ -32,6 +32,9 @@ CREATE TABLE prefix_workshop (
gradingweight INT NOT NULL default '5',
timeagreed INT8 NOT NULL default '0'
);

CREATE INDEX prefix_workshop_course_idx ON prefix_workshop (course);

# --------------------------------------------------------

#
Expand All @@ -53,6 +56,10 @@ CREATE TABLE prefix_workshop_submissions (
finalgrade INT NOT NULL default '0'
);
CREATE INDEX prefix_workshop_submissions_title_idx on prefix_workshop_submissions (title);
CREATE INDEX prefix_workshop_submissions_workshopid_idx ON prefix_workshop_submissions (workshopid);
CREATE INDEX prefix_workshop_submissions_userid_idx ON prefix_workshop_submissions (userid);
CREATE INDEX prefix_workshop_submissions_mailed_idx ON prefix_workshop_submissions (mailed);

# --------------------------------------------------------

#
Expand All @@ -73,6 +80,12 @@ CREATE TABLE prefix_workshop_assessments (
generalcomment text NOT NULL default '',
teachercomment text NOT NULL default ''
);

CREATE INDEX prefix_workshop_assessments_workshopid_idx ON prefix_workshop_assessments (workshopid);
CREATE INDEX prefix_workshop_assessments_submissionid_idx ON prefix_workshop_assessments (submissionid);
CREATE INDEX prefix_workshop_assessments_userid_idx ON prefix_workshop_assessments (userid);
CREATE INDEX prefix_workshop_assessments_mailed_idx ON prefix_workshop_assessments (mailed);

# --------------------------------------------------------

#
Expand All @@ -88,6 +101,9 @@ CREATE TABLE prefix_workshop_elements (
maxscore INT NOT NULL default '1',
weight float NOT NULL default '1.0'
);

CREATE INDEX prefix_workshop_elements_workshopid_idx ON prefix_workshop_elements (workshopid);

# --------------------------------------------------------

#
Expand All @@ -102,6 +118,10 @@ CREATE TABLE prefix_workshop_grades (
feedback text NOT NULL default '',
grade INT NOT NULL default '0'
);

CREATE INDEX prefix_workshop_grades_workshopid_idx ON prefix_workshop_grades (workshopid);
CREATE INDEX prefix_workshop_grades_assessmentid_idx ON prefix_workshop_grades (assessmentid);

# --------------------------------------------------------
CREATE TABLE prefix_workshop_comments (
id SERIAL PRIMARY KEY,
Expand All @@ -113,6 +133,10 @@ CREATE TABLE prefix_workshop_comments (
comments text NOT NULL default ''
);

CREATE INDEX prefix_workshop_comments_workshopid_idx ON prefix_workshop_comments (workshopid);
CREATE INDEX prefix_workshop_comments_assessmentid_idx ON prefix_workshop_comments (assessmentid);
CREATE INDEX prefix_workshop_comments_userid_idx ON prefix_workshop_comments (userid);
CREATE INDEX prefix_workshop_comments_mailed_idx ON prefix_workshop_comments (mailed);

INSERT INTO prefix_log_display VALUES ('workshop', 'assess', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'close', 'workshop', 'name');
Expand Down
2 changes: 1 addition & 1 deletion mod/workshop/version.php
View file
Expand Up @@ -5,7 +5,7 @@
// This fragment is called by /admin/index.php
////////////////////////////////////////////////////////////////////////////////

$module->version = 2004060400;
$module->version = 2004060401;
$module->requires = 2004052505; // Requires this Moodle version
$module->cron = 60;

Expand Down

0 comments on commit 9958e23

Please sign in to comment.