if ($oldwrappedquestion->qtype != $wrapped->qtype) {
switch ($oldwrappedquestion->qtype) {
case 'multichoice':
- $DB->delete_records('question_multichoice',
- array('question' => $oldwrappedquestion->id));
+ $DB->delete_records('qtype_multichoice_options',
+ array('questionid' => $oldwrappedquestion->id));
break;
case 'shortanswer':
$DB->delete_records('qtype_shortanswer_options',
// Now create the qtype own structures.
$multichoice = new backup_nested_element('multichoice', array('id'), array(
- 'layout', 'answers', 'single', 'shuffleanswers',
+ 'layout', 'single', 'shuffleanswers',
'correctfeedback', 'correctfeedbackformat',
'partiallycorrectfeedback', 'partiallycorrectfeedbackformat',
'incorrectfeedback', 'incorrectfeedbackformat', 'answernumbering', 'shownumcorrect'));
$pluginwrapper->add_child($multichoice);
// Set source to populate the data.
- $multichoice->set_source_table('question_multichoice',
- array('question' => backup::VAR_PARENTID));
+ $multichoice->set_source_table('qtype_multichoice_options',
+ array('questionid' => backup::VAR_PARENTID));
// Don't need to annotate ids nor files.
$questioncreated = (bool) $this->get_mappingid('question_created', $oldquestionid);
// If the question has been created by restore, we need to create its
- // question_multichoice too.
+ // qtype_multichoice_options too.
if ($questioncreated) {
// Adjust some columns.
- $data->question = $newquestionid;
- // Map sequence of question_answer ids.
- if ($data->answers) {
- $answersarr = explode(',', $data->answers);
- } else {
- $answersarr = array();
- }
- foreach ($answersarr as $key => $answer) {
- $answersarr[$key] = $this->get_mappingid('question_answer', $answer);
- }
- $data->answers = implode(',', $answersarr);
+ $data->questionid = $newquestionid;
// Insert record.
- $newitemid = $DB->insert_record('question_multichoice', $data);
+ $newitemid = $DB->insert_record('qtype_multichoice_options', $data);
// Create mapping (needed for decoding links).
- $this->set_mapping('question_multichoice', $oldid, $newitemid);
+ $this->set_mapping('qtype_multichoice_options', $oldid, $newitemid);
}
}
$contents = array();
$fields = array('correctfeedback', 'partiallycorrectfeedback', 'incorrectfeedback');
- $contents[] = new restore_decode_content('question_multichoice',
- $fields, 'question_multichoice');
+ $contents[] = new restore_decode_content('qtype_multichoice_options',
+ $fields, 'qtype_multichoice_options');
return $contents;
}
xsi:noNamespaceSchemaLocation="../../../../lib/xmldb/xmldb.xsd"
>
<TABLES>
- <TABLE NAME="question_multichoice" COMMENT="Options for multiple choice questions">
+ <TABLE NAME="qtype_multichoice_options" COMMENT="Options for multiple choice questions">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
- <FIELD NAME="question" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="Foreign key references question.id"/>
+ <FIELD NAME="questionid" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="Foreign key references question.id"/>
<FIELD NAME="layout" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="Not used. Was intended for a vertical/horizontal layout option. See MDL-18445."/>
- <FIELD NAME="answers" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" COMMENT="Redundant. Comma-separated list of question_answer ids. SELECT id FROM question_answers WHERE question = ? ORDER BY id."/>
<FIELD NAME="single" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="If 0 it multiple response (checkboxes). Otherwise it is radio buttons."/>
<FIELD NAME="shuffleanswers" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="1" SEQUENCE="false" COMMENT="Whether the choices can be randomly shuffled."/>
<FIELD NAME="correctfeedback" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="Feedback shown for any correct response."/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
- <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id"/>
+ <KEY NAME="questionid" TYPE="foreign-unique" FIELDS="questionid" REFTABLE="question" REFFIELDS="id"/>
</KEYS>
</TABLE>
</TABLES>
$dbman = $DB->get_manager();
-
// Moodle v2.2.0 release upgrade line
// Put any upgrade step following this.
// Moodle v2.3.0 release upgrade line
// Put any upgrade step following this.
-
// Moodle v2.4.0 release upgrade line
// Put any upgrade step following this.
-
// Moodle v2.5.0 release upgrade line.
// Put any upgrade step following this.
+ if ($oldversion < 2013092300) {
+ // Find duplicate rows before they break the 2013092304 step below.
+ $problemids = $DB->get_recordset_sql("
+ SELECT question, MIN(id) AS recordidtokeep
+ FROM {question_multichoice}
+ GROUP BY question
+ HAVING COUNT(1) > 1
+ ");
+ foreach ($problemids as $problem) {
+ $DB->delete_records_select('question_multichoice',
+ 'question = ? AND id > ?',
+ array($problem->question, $problem->recordidtokeep));
+ }
+ $problemids->close();
+
+ // Shortanswer savepoint reached.
+ upgrade_plugin_savepoint(true, 2013092300, 'qtype', 'multichoice');
+ }
+
+ if ($oldversion < 2013092301) {
+
+ // Define table question_multichoice to be renamed to qtype_multichoice_options.
+ $table = new xmldb_table('question_multichoice');
+
+ // Launch rename table for question_multichoice.
+ $dbman->rename_table($table, 'qtype_multichoice_options');
+
+ // Record that qtype_match savepoint was reached.
+ upgrade_plugin_savepoint(true, 2013092301, 'qtype', 'multichoice');
+ }
+
+ if ($oldversion < 2013092302) {
+
+ // Define key question (foreign) to be dropped form qtype_multichoice_options.
+ $table = new xmldb_table('qtype_multichoice_options');
+ $key = new xmldb_key('question', XMLDB_KEY_FOREIGN, array('question'), 'question', array('id'));
+
+ // Launch drop key question.
+ $dbman->drop_key($table, $key);
+
+ // Record that qtype_match savepoint was reached.
+ upgrade_plugin_savepoint(true, 2013092302, 'qtype', 'multichoice');
+ }
+
+ if ($oldversion < 2013092303) {
+
+ // Rename field question on table qtype_multichoice_options to questionid.
+ $table = new xmldb_table('qtype_multichoice_options');
+ $field = new xmldb_field('question', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'id');
+
+ // Launch rename field question.
+ $dbman->rename_field($table, $field, 'questionid');
+
+ // Record that qtype_match savepoint was reached.
+ upgrade_plugin_savepoint(true, 2013092303, 'qtype', 'multichoice');
+ }
+
+ if ($oldversion < 2013092304) {
+
+ // Define key questionid (foreign-unique) to be added to qtype_multichoice_options.
+ $table = new xmldb_table('qtype_multichoice_options');
+ $key = new xmldb_key('questionid', XMLDB_KEY_FOREIGN_UNIQUE, array('questionid'), 'question', array('id'));
+
+ // Launch add key questionid.
+ $dbman->add_key($table, $key);
+
+ // Record that qtype_match savepoint was reached.
+ upgrade_plugin_savepoint(true, 2013092304, 'qtype', 'multichoice');
+ }
+
+ if ($oldversion < 2013092305) {
+
+ // Define field answers to be dropped from qtype_multichoice_options.
+ $table = new xmldb_table('qtype_multichoice_options');
+ $field = new xmldb_field('answers');
+
+ // Conditionally launch drop field answers.
+ if ($dbman->field_exists($table, $field)) {
+ $dbman->drop_field($table, $field);
+ }
+
+ // Record that qtype_match savepoint was reached.
+ upgrade_plugin_savepoint(true, 2013092305, 'qtype', 'multichoice');
+ }
return true;
}
class qtype_multichoice extends question_type {
public function get_question_options($question) {
global $DB, $OUTPUT;
- $question->options = $DB->get_record('question_multichoice',
- array('question' => $question->id), '*', MUST_EXIST);
+ $question->options = $DB->get_record('qtype_multichoice_options',
+ array('questionid' => $question->id), '*', MUST_EXIST);
parent::get_question_options($question);
}
// Insert all the new answers.
$totalfraction = 0;
$maxfraction = -1;
- $answers = array();
foreach ($question->answer as $key => $answerdata) {
if (trim($answerdata['text']) == '') {
continue;
$answer->feedbackformat = $question->feedback[$key]['format'];
$DB->update_record('question_answers', $answer);
- $answers[] = $answer->id;
if ($question->fraction[$key] > 0) {
$totalfraction += $question->fraction[$key];
$DB->delete_records('question_answers', array('id' => $oldanswer->id));
}
- $options = $DB->get_record('question_multichoice', array('question' => $question->id));
+ $options = $DB->get_record('qtype_multichoice_options', array('questionid' => $question->id));
if (!$options) {
$options = new stdClass();
- $options->question = $question->id;
+ $options->questionid = $question->id;
$options->correctfeedback = '';
$options->partiallycorrectfeedback = '';
$options->incorrectfeedback = '';
- $options->id = $DB->insert_record('question_multichoice', $options);
+ $options->id = $DB->insert_record('qtype_multichoice_options', $options);
}
- $options->answers = implode(',', $answers);
$options->single = $question->single;
if (isset($question->layout)) {
$options->layout = $question->layout;
$options->answernumbering = $question->answernumbering;
$options->shuffleanswers = $question->shuffleanswers;
$options = $this->save_combined_feedback_helper($options, $question, $context, true);
- $DB->update_record('question_multichoice', $options);
+ $DB->update_record('qtype_multichoice_options', $options);
$this->save_hints($question, true);
public function delete_question($questionid, $contextid) {
global $DB;
- $DB->delete_records('question_multichoice', array('question' => $questionid));
+ $DB->delete_records('qtype_multichoice_options', array('question' => $questionid));
parent::delete_question($questionid, $contextid);
}
}
foreach ($questiondata->options as $optionname => $value) {
- if (!in_array($optionname, array('answers'))) {
+ if ($optionname != 'answers') {
$this->assertAttributeEquals($value, $optionname, $actualquestiondata->options);
}
}
defined('MOODLE_INTERNAL') || die();
$plugin->component = 'qtype_multichoice';
-$plugin->version = 2013050100;
+$plugin->version = 2013092305;
$plugin->requires = 2013050100;
