We have extremely crappy support for postgres7 in those modules in 14_STABLE, someone forgot to backport from HEAD?

This commit is contained in:
patrickslee
2005-07-27 22:16:43 +00:00
parent ca0a595d48
commit 03f9fd035b
3 changed files with 70 additions and 7 deletions
+1
View File
@@ -13,6 +13,7 @@ CREATE TABLE prefix_lesson (
maxanswers INT NOT NULL default '4',
maxattempts INT NOT NULL default '0',
nextpagedefault INT NOT NULL default '0',
minquestions INT NOT NULL default '0',
maxpages INT NOT NULL default '0',
retake INT NOT NULL default '1',
available INT8 NOT NULL default '0',
+46
View File
@@ -24,10 +24,56 @@ function workshop_upgrade($oldversion) {
");
}
if ($oldversion < 2003051400) {
table_column("workshop", "", "showleaguetable", "INT", "2", "UNSIGNED", "0", "NOT NULL");
execute_sql("
CREATE TABLE {$CFG->prefix}workshop_rubrics (
id SERIAL PRIMARY KEY,
workshopid INT8 NOT NULL default '0',
elementid INT8 NOT NULL default '0',
rubricno INT NOT NULL default '0',
description text NOT NULL default ''
)
");
}
if ($oldversion < 2003082200) {
table_column("workshop_rubrics", "elementid", "elementno", "INT", "8", "UNSIGNED", "0", "NOT NULL");
}
if ($oldversion < 2003092500) {
table_column("workshop", "", "overallocation", "INT", "2", "UNSIGNED", "0", "NOT NULL");
}
if ($oldversion < 2003100200) {
table_column("workshop_assessments", "", "resubmission", "INT", "2", "UNSIGNED", "0", "NOT NULL");
}
if ($oldversion < 2003100800) {
// tidy up log_display entries
execute_sql("DELETE FROM {$CFG->prefix}log_display WHERE `module` = 'workshop'");
execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES('workshop', 'assessments', 'workshop', 'name')");
execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'close', 'workshop', 'name')");
execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'display', 'workshop', 'name')");
execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'resubmit', 'workshop', 'name')");
execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'set up', 'workshop', 'name')");
execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'submissions', 'workshop', 'name')");
execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'view', 'workshop', 'name')");
execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'update', 'workshop', 'name')");
}
if ($oldversion < 2003113000) {
table_column("workshop", "", "teacherloading", "INT", "2", "unsigned", "5", "NOT NULL");
table_column("workshop", "", "assessmentstodrop", "INT", "2", "unsigned", "0", "NOT NULL");
table_column("workshop_assessments", "", "donotuse", "INT", "2", "unsigned", "0", "NOT NULL");
execute_sql("CREATE INDEX prefix_workshop_grades_assessmentid_idx ON prefix_workshop_grades (assessmentid)");
}
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);');
+23 -7
View File
@@ -30,7 +30,9 @@ CREATE TABLE prefix_workshop (
biasweight INT NOT NULL default '5',
reliabilityweight INT NOT NULL default '5',
gradingweight INT NOT NULL default '5',
timeagreed INT8 NOT NULL default '0'
teacherloading INT NOT NULL default '5',
assessmentstodrop INT NOT NULL default '0',
showleaguetable INT NOT NULL default '0',
);
CREATE INDEX prefix_workshop_course_idx ON prefix_workshop (course);
@@ -73,10 +75,12 @@ CREATE TABLE prefix_workshop_assessments (
userid INT8 NOT NULL default '0',
timecreated INT8 NOT NULL default '0',
timegraded INT8 NOT NULL default '0',
timeagreed INT8 NOT NULL default '0',
grade float NOT NULL default '0',
gradinggrade INT NOT NULL default '0',
mailed INT2 NOT NULL default '0',
resubmission INT2 NOT NULL default '0',
donotuse INT2 NOT NULL default '0',
generalcomment text NOT NULL default '',
teachercomment text NOT NULL default ''
);
@@ -106,6 +110,19 @@ CREATE INDEX prefix_workshop_elements_workshopid_idx ON prefix_workshop_elements
# --------------------------------------------------------
#
# Table structure for table workshop_rubrics
#
CREATE TABLE prefix_workshop_rubrics (
id SERIAL PRIMARY KEY,
workshopid INT8 NOT NULL default '0',
elementno INT8 NOT NULL default '0',
rubricno INT NOT NULL default '0',
description text NOT NULL default ''
);
# --------------------------------------------------------
#
# Table structure for table workshop_grades
#
@@ -138,13 +155,12 @@ CREATE INDEX prefix_workshop_comments_assessmentid_idx ON prefix_workshop_commen
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', 'assessments', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'close', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'display grades', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'grade', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'hide grades', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'open', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'submit', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'display', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'resubmit', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'set up', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'submissions', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'view', 'workshop', 'name');
INSERT INTO prefix_log_display VALUES ('workshop', 'update', 'workshop', 'name');
COMMIT;