From c0d6bcc508dd9c331d4054923fc3d75a21e00310 Mon Sep 17 00:00:00 2001 From: moodler Date: Sat, 5 Oct 2002 17:20:24 +0000 Subject: [PATCH] Moved upgrade functions into db/mysql.sql --- mod/assignment/db/mysql.php | 87 ++++++++++++++++++++++++++++++++++++ mod/assignment/version.php | 84 ---------------------------------- mod/choice/db/mysql.php | 16 +++++++ mod/choice/version.php | 13 ------ mod/forum/db/mysql.php | 57 ++++++++++++++++++++++++ mod/forum/version.php | 54 ---------------------- mod/journal/db/mysql.php | 16 +++++++ mod/journal/version.php | 15 +------ mod/quiz/db/mysql.php | 16 +++++++ mod/quiz/version.php | 13 ------ mod/survey/db/mysql.php | 89 +++++++++++++++++++++++++++++++++++++ mod/survey/version.php | 86 ----------------------------------- 12 files changed, 282 insertions(+), 264 deletions(-) create mode 100644 mod/assignment/db/mysql.php create mode 100644 mod/choice/db/mysql.php create mode 100644 mod/forum/db/mysql.php create mode 100644 mod/journal/db/mysql.php create mode 100644 mod/quiz/db/mysql.php create mode 100644 mod/survey/db/mysql.php diff --git a/mod/assignment/db/mysql.php b/mod/assignment/db/mysql.php new file mode 100644 index 0000000000..0c12d56212 --- /dev/null +++ b/mod/assignment/db/mysql.php @@ -0,0 +1,87 @@ +dataroot"); + while ($dir = readdir($basedir)) { + if ($dir == "." || $dir == ".." || $dir == "users") { + continue; + } + if (filetype("$CFG->dataroot/$dir") != "dir") { + continue; + } + $coursedir = "$CFG->dataroot/$dir"; + + if (! $coursemoddata = make_mod_upload_directory($dir)) { + echo "Error: could not create mod upload directory: $coursemoddata"; + continue; + } + + if (file_exists("$coursedir/assignment")) { + if (! rename("$coursedir/assignment", "$coursemoddata/assignment")) { + echo "Error: could not move $coursedir/assignment to $coursemoddata/assignment\n"; + } + } + } + } + + return true; +} + + +?> + diff --git a/mod/assignment/version.php b/mod/assignment/version.php index a2dbca0f86..8571ceb30d 100644 --- a/mod/assignment/version.php +++ b/mod/assignment/version.php @@ -8,88 +8,4 @@ $module->version = 2002082806; $module->cron = 60; -function assignment_upgrade($oldversion) { -// This function does anything necessary to upgrade -// older versions to match current functionality - - global $CFG; - - if ($oldversion < 2002080500) { - - execute_sql(" - CREATE TABLE `assignment` ( - `id` int(10) unsigned NOT NULL auto_increment, - `course` int(10) unsigned NOT NULL default '0', - `name` varchar(255) NOT NULL default '', - `description` text NOT NULL, - `type` int(10) unsigned NOT NULL default '1', - `maxbytes` int(10) unsigned NOT NULL default '100000', - `timedue` int(10) unsigned NOT NULL default '0', - `grade` int(10) NOT NULL default '0', - `timemodified` int(10) unsigned NOT NULL default '0', - PRIMARY KEY (`id`) - ) COMMENT='Defines assignments' - "); - - execute_sql(" - CREATE TABLE `assignment_submissions` ( - `id` int(10) unsigned NOT NULL default '0', - `assignment` int(10) unsigned NOT NULL default '0', - `user` int(10) unsigned NOT NULL default '0', - `timecreated` int(10) unsigned NOT NULL default '0', - `timemodified` int(10) unsigned NOT NULL default '0', - `numfiles` int(10) unsigned NOT NULL default '0', - `grade` int(11) NOT NULL default '0', - `comment` text NOT NULL, - `teacher` int(10) unsigned NOT NULL default '0', - `timemarked` int(10) unsigned NOT NULL default '0', - `mailed` tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (`id`) - ) COMMENT='Info about submitted assignments' - "); - - execute_sql(" INSERT INTO log_display VALUES ('assignment', 'view', 'assignment', 'name') "); - execute_sql(" INSERT INTO log_display VALUES ('assignment', 'add', 'assignment', 'name') "); - execute_sql(" INSERT INTO log_display VALUES ('assignment', 'update', 'assignment', 'name') "); - execute_sql(" INSERT INTO log_display VALUES ('assignment', 'view submissions', 'assignment', 'name') "); - execute_sql(" INSERT INTO log_display VALUES ('assignment', 'upload', 'assignment', 'name') "); - } - - if ($oldversion < 2002080701) { - execute_sql(" ALTER TABLE `assignment_submissions` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT "); - } - - if ($oldversion < 2002082806) { - // assignment file area was moved, so rename all the directories in existing courses - - notify("Moving location of assignment files..."); - - $basedir = opendir("$CFG->dataroot"); - while ($dir = readdir($basedir)) { - if ($dir == "." || $dir == ".." || $dir == "users") { - continue; - } - if (filetype("$CFG->dataroot/$dir") != "dir") { - continue; - } - $coursedir = "$CFG->dataroot/$dir"; - - if (! $coursemoddata = make_mod_upload_directory($dir)) { - echo "Error: could not create mod upload directory: $coursemoddata"; - continue; - } - - if (file_exists("$coursedir/assignment")) { - if (! rename("$coursedir/assignment", "$coursemoddata/assignment")) { - echo "Error: could not move $coursedir/assignment to $coursemoddata/assignment\n"; - } - } - } - } - - return true; -} - - ?> - diff --git a/mod/choice/db/mysql.php b/mod/choice/db/mysql.php new file mode 100644 index 0000000000..c627c9aa33 --- /dev/null +++ b/mod/choice/db/mysql.php @@ -0,0 +1,16 @@ + + diff --git a/mod/choice/version.php b/mod/choice/version.php index a7d554f05c..03b2b9fc16 100644 --- a/mod/choice/version.php +++ b/mod/choice/version.php @@ -8,17 +8,4 @@ $module->version = 2002090800; $module->cron = 0; -function choice_upgrade($oldversion) { -// This function does anything necessary to upgrade -// older versions to match current functionality - - if ($oldversion < 2002090800) { - execute_sql(" ALTER TABLE `choice` CHANGE `answer1` `answer1` VARCHAR( 255 )"); - execute_sql(" ALTER TABLE `choice` CHANGE `answer2` `answer2` VARCHAR( 255 )"); - } - return true; -} - - ?> - diff --git a/mod/forum/db/mysql.php b/mod/forum/db/mysql.php new file mode 100644 index 0000000000..a22eafbc67 --- /dev/null +++ b/mod/forum/db/mysql.php @@ -0,0 +1,57 @@ +Don't worry about this error - your server already had this upgrade applied"; + } + } + + if ($oldversion < 2002100300) { + execute_sql(" ALTER TABLE `forum` CHANGE `open` `open` TINYINT(2) UNSIGNED DEFAULT '2' NOT NULL "); + execute_sql(" UPDATE `forum` SET `open` = 2 WHERE `open` = 1 "); + execute_sql(" UPDATE `forum` SET `open` = 1 WHERE `open` = 0 "); + } + + return true; + +} + + + +?> + diff --git a/mod/forum/version.php b/mod/forum/version.php index 9baedd3a90..1168cda88b 100644 --- a/mod/forum/version.php +++ b/mod/forum/version.php @@ -8,58 +8,4 @@ $module->version = 2002100300; $module->cron = 60; -function forum_upgrade($oldversion) { -// This function does anything necessary to upgrade -// older versions to match current functionality - - if ($oldversion < 2002073008) { - execute_sql("DELETE FROM modules WHERE name = 'discuss' "); - execute_sql("ALTER TABLE `discuss` RENAME `forum_discussions` "); - execute_sql("ALTER TABLE `discuss_posts` RENAME `forum_posts` "); - execute_sql("ALTER TABLE `discuss_ratings` RENAME `forum_ratings` "); - execute_sql("ALTER TABLE `forum` CHANGE `intro` `intro` TEXT NOT NULL "); - execute_sql("ALTER TABLE `forum` ADD `forcesubscribe` TINYINT(1) UNSIGNED DEFAULT '0' NOT NULL AFTER `assessed`"); - execute_sql("ALTER TABLE `forum` CHANGE `type` `type` ENUM( 'single', 'news', 'social', 'general', - 'eachuser', 'teacher' ) DEFAULT 'general' NOT NULL "); - execute_sql("ALTER TABLE `forum_posts` CHANGE `discuss` `discussion` INT( 10 ) UNSIGNED DEFAULT '0' NOT NULL "); - execute_sql("INSERT INTO log_display VALUES ('forum', 'add', 'forum', 'name') "); - execute_sql("INSERT INTO log_display VALUES ('forum', 'add discussion', 'forum_discussions', 'name') "); - execute_sql("INSERT INTO log_display VALUES ('forum', 'add post', 'forum_posts', 'subject') "); - execute_sql("INSERT INTO log_display VALUES ('forum', 'update post', 'forum_posts', 'subject') "); - execute_sql("INSERT INTO log_display VALUES ('forum', 'view discussion', 'forum_discussions', 'name') "); - execute_sql("DELETE FROM log_display WHERE module = 'discuss' "); - execute_sql("UPDATE log SET action = 'view discussion' WHERE module = 'discuss' AND action = 'view' "); - execute_sql("UPDATE log SET action = 'add discussion' WHERE module = 'discuss' AND action = 'add' "); - execute_sql("UPDATE log SET module = 'forum' WHERE module = 'discuss' "); - notify("Renamed all the old discuss tables (now part of forum) and created new forum_types"); - } - - if ($oldversion < 2002080100) { - execute_sql("INSERT INTO log_display VALUES ('forum', 'view subscribers', 'forum', 'name') "); - execute_sql("INSERT INTO log_display VALUES ('forum', 'update', 'forum', 'name') "); - } - - if ($oldversion < 2002082900) { - execute_sql(" ALTER TABLE `forum_posts` ADD `attachment` VARCHAR(100) NOT NULL AFTER `message` "); - } - - if ($oldversion < 2002091000) { - if (! execute_sql(" ALTER TABLE `forum_posts` ADD `attachment` VARCHAR(100) NOT NULL AFTER `message` ")) { - echo "

Don't worry about this error - your server already had this upgrade applied"; - } - } - - if ($oldversion < 2002100300) { - execute_sql(" ALTER TABLE `forum` CHANGE `open` `open` TINYINT(2) UNSIGNED DEFAULT '2' NOT NULL "); - execute_sql(" UPDATE `forum` SET `open` = 2 WHERE `open` = 1 "); - execute_sql(" UPDATE `forum` SET `open` = 1 WHERE `open` = 0 "); - } - - return true; - -} - - - ?> - diff --git a/mod/journal/db/mysql.php b/mod/journal/db/mysql.php new file mode 100644 index 0000000000..5d0c042552 --- /dev/null +++ b/mod/journal/db/mysql.php @@ -0,0 +1,16 @@ +version = 2002082000; $module->cron = 60; -function journal_upgrade($oldversion) { -// This function does anything necessary to upgrade -// older versions to match current functionality - - $result = true; - - if ($oldversion < 20020810) { - if (! execute_sql("ALTER TABLE `journal_entries` ADD `mailed` TINYINT(1) UNSIGNED DEFAULT '0' NOT NULL")) { - $result = false; - } - } - - return $result; -} +?> diff --git a/mod/quiz/db/mysql.php b/mod/quiz/db/mysql.php new file mode 100644 index 0000000000..d24d36560e --- /dev/null +++ b/mod/quiz/db/mysql.php @@ -0,0 +1,16 @@ + diff --git a/mod/quiz/version.php b/mod/quiz/version.php index a8ccabd5ef..203408afa2 100644 --- a/mod/quiz/version.php +++ b/mod/quiz/version.php @@ -8,17 +8,4 @@ $module->version = 2002100300; // The (date) version of this module $module->cron = 0; // How often should cron check this module (seconds)? -function quiz_upgrade($oldversion) { -// This function does anything necessary to upgrade -// older versions to match current functionality - - global $CFG; - - if ($oldversion < 2002100300) { - - } - - return true; -} - ?> diff --git a/mod/survey/db/mysql.php b/mod/survey/db/mysql.php new file mode 100644 index 0000000000..f47b8c8d9e --- /dev/null +++ b/mod/survey/db/mysql.php @@ -0,0 +1,89 @@ + + diff --git a/mod/survey/version.php b/mod/survey/version.php index 2827e40e0e..82e3d402b0 100644 --- a/mod/survey/version.php +++ b/mod/survey/version.php @@ -8,90 +8,4 @@ $module->version = 2002082000; $module->cron = 0; -function survey_upgrade($oldversion) { -// This function does anything necessary to upgrade -// older versions to match current functionality - - if ($oldversion < 2002081400) { - - execute_sql(" ALTER TABLE `survey_questions` DROP `owner` "); - execute_sql(" ALTER TABLE `survey_questions` ADD `shorttext` VARCHAR(30) NOT NULL AFTER `text` "); - - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'focus on interesting issues' WHERE id = 1 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'important to my practice' WHERE id = 2 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'improve my practice' WHERE id = 3 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'connects with my practice' WHERE id = 4 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'I\'m critical of my learning' WHERE id = 5 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'I\'m critical of my own ideas' WHERE id = 6 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'I\'m critical of other students' WHERE id = 7 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'I\'m critical of readings' WHERE id = 8 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'I explain my ideas' WHERE id = 9 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'I ask for explanations' WHERE id =10 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'I\'m asked to explain' WHERE id =11 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'students respond to me' WHERE id =12 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'tutor stimulates thinking' WHERE id =13 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'tutor encourages me' WHERE id =14 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'tutor models discourse' WHERE id =15 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'tutor models self-reflection' WHERE id =16 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'students encourage me' WHERE id =17 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'students praise me' WHERE id =18 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'students value me' WHERE id =19 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'student empathise' WHERE id =20 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'I understand other students' WHERE id =21 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'students understand me' WHERE id =22 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'I understand the tutor' WHERE id =23 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'tutor understands me' WHERE id =24 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Relevance' WHERE id =25 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Reflective Thinking' WHERE id =26 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Interactivity' WHERE id =27 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Tutor Support' WHERE id =28 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Peer Support' WHERE id =29 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Interpretation' WHERE id =30 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Relevance' WHERE id =31 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Reflective Thinking' WHERE id =32 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Interactivity' WHERE id =33 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'Tutor Support' WHERE id =34 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =35 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =36 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =37 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =38 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =39 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =40 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =41 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =42 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =43 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =44 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'focus quality of argument' WHERE id =45 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'play devil\'s advocate' WHERE id =46 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'where people come from' WHERE id =47 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'understand different people' WHERE id =48 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'interact with variety' WHERE id =49 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'enjoy hearing opinions' WHERE id =50 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'strengthen by argue' WHERE id =51 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'know why people do' WHERE id =52 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'argue with authors' WHERE id =53 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'remain objective' WHERE id =54 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'think WITH people' WHERE id =55 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'use criteria to evaluate' WHERE id =56 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'try to understand' WHERE id =57 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'point out weaknesses' WHERE id =58 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'put myself in their shoes' WHERE id =59 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'putting on trial' WHERE id =60 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'i value logic most' WHERE id =61 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'insight from empathy' WHERE id =62 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'make effort to extend' WHERE id =63 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = 'what\'s wrong\?' WHERE id =64 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =65 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =66 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =67 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =68 "); - execute_sql(" UPDATE `survey_questions` SET `shorttext` = '' WHERE id =69 "); - - } - - return true; -} - - ?> - -- 2.39.5