L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug related to postgres - inserts into prefix_exercise_assessments were failing,

Browse Source 
because generalcomment and teachercomment were not null and didn't have defaults.
for some reason mysql allows this but postgres complains. I've set empty string defaults and added into mysql for consistency.
This commit is contained in:
mjollnir_
2004-09-10 04:42:01 +00:00
parent 01a5135d87
commit a6c7e600bc
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/exercise/db/mysql.php
+4
View File
@@ -30,6 +30,10 @@ function exercise_upgrade($oldversion) {
table_column("exercise", "", "password", "VARCHAR", "32", "", "", "NOT NULL");
}
if ($oldversion < 2004091000) {
table_column("exercise_assessments","generalcomment","generalcomment","text","","","","NOT NULL");
table_column("exercise_assessments","teachercomment","teachercomment","text","","","","NOT NULL");
}
return true;
}
mod/exercise/db/mysql.sql
+2 -2
View File
@@ -57,8 +57,8 @@ CREATE TABLE `prefix_exercise_assessments` (
`grade` float NOT NULL default '0',
`gradinggrade` int(3) NOT NULL default '0',
`mailed` tinyint(2) unsigned NOT NULL default '0',
`generalcomment` text NOT NULL,
`teachercomment` text NOT NULL,
`generalcomment` text NOT NULL default '',
`teachercomment` text NOT NULL default '',
PRIMARY KEY (`id`),
INDEX (`submissionid`),
INDEX (`userid`)
mod/exercise/db/postgres7.php
+4
View File
@@ -20,6 +20,10 @@ function exercise_upgrade($oldversion) {
table_column("exercise", "", "password", "VARCHAR", "32", "", "", "NOT NULL");
}
if ($oldversion < 2004091000) {
table_column("exercise_assessments","generalcomment","generalcomment","text","","","","NOT NULL");
table_column("exercise_assessments","teachercomment","teachercomment","text","","","","NOT NULL");
}
return true;
}
mod/exercise/db/postgres7.sql
+2 -2
View File
@@ -55,8 +55,8 @@ CREATE TABLE prefix_exercise_assessments (
grade float NOT NULL default '0',
gradinggrade INT NOT NULL default '0',
mailed INT2 NOT NULL default '0',
generalcomment text NOT NULL,
teachercomment text NOT NULL
generalcomment text NOT NULL default '',
teachercomment text NOT NULL default ''
);
# --------------------------------------------------------
CREATE INDEX prefix_exercise_assessments_submissionid_idx ON prefix_exercise_assessments (submissionid);
mod/exercise/version.php
+1 -1
View File
@@ -5,7 +5,7 @@
// This fragment is called by /admin/index.php
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004090200;
$module->version = 2004091000;
$module->requires = 2004052505; // Requires this Moodle version
$module->cron = 60;