From 717cfb0a7ba071d251e40b2a0d29f663ebc00270 Mon Sep 17 00:00:00 2001 From: tjhunt Date: Tue, 19 Sep 2006 10:56:00 +0000 Subject: [PATCH] Rename column question_dataset_items->number to itemnumber, to avoid reserved word. --- mod/quiz/db/mysql.php | 4 ++++ mod/quiz/db/mysql.sql | 2 +- mod/quiz/db/postgres7.php | 4 ++++ mod/quiz/db/postgres7.sql | 2 +- mod/quiz/restorelibpre15.php | 2 +- mod/quiz/version.php | 2 +- question/backuplib.php | 2 +- question/format/webct/format.php | 8 ++++---- question/restorelib.php | 2 +- question/type/datasetdependent/abstractqtype.php | 2 +- question/type/datasetdependent/datasetitems.php | 8 ++++---- 11 files changed, 23 insertions(+), 15 deletions(-) diff --git a/mod/quiz/db/mysql.php b/mod/quiz/db/mysql.php index e65a8a4301..2d6dd99e3b 100644 --- a/mod/quiz/db/mysql.php +++ b/mod/quiz/db/mysql.php @@ -1136,6 +1136,10 @@ function quiz_upgrade($oldversion) { $success = $success && table_column('question_sessions', 'comment', 'manualcomment', 'text', '', '', ''); } + if ($success && $oldversion < 2006091900) { + $success = $success && table_column('question_dataset_items', 'number', 'itemnumber', 'text', '', '', ''); + } + return $success; } diff --git a/mod/quiz/db/mysql.sql b/mod/quiz/db/mysql.sql index e4c0c6f3c9..2b14cce152 100644 --- a/mod/quiz/db/mysql.sql +++ b/mod/quiz/db/mysql.sql @@ -187,7 +187,7 @@ CREATE TABLE prefix_question_dataset_definitions ( CREATE TABLE prefix_question_dataset_items ( id int(10) unsigned NOT NULL auto_increment, definition int(10) unsigned NOT NULL default '0', - number int(10) unsigned NOT NULL default '0', + itemnumber int(10) unsigned NOT NULL default '0', value varchar(255) NOT NULL default '', PRIMARY KEY (id), KEY definition (definition) diff --git a/mod/quiz/db/postgres7.php b/mod/quiz/db/postgres7.php index bc98cba554..5037ae2703 100644 --- a/mod/quiz/db/postgres7.php +++ b/mod/quiz/db/postgres7.php @@ -1458,6 +1458,10 @@ function quiz_upgrade($oldversion) { $success = $success && table_column('question_sessions', 'comment', 'manualcomment', 'text', '', '', ''); } + if ($success && $oldversion < 2006091900) { + $success = $success && table_column('question_dataset_items', 'number', 'itemnumber', 'text', '', '', ''); + } + return $success; } diff --git a/mod/quiz/db/postgres7.sql b/mod/quiz/db/postgres7.sql index e89bc02896..02b04664ad 100644 --- a/mod/quiz/db/postgres7.sql +++ b/mod/quiz/db/postgres7.sql @@ -176,7 +176,7 @@ CREATE INDEX prefix_question_dataset_definitions_category_idx ON prefix_question CREATE TABLE prefix_question_dataset_items ( id SERIAL8 PRIMARY KEY, definition INT8 NOT NULL default '0', - number INT8 NOT NULL default '0', + itemnumber INT8 NOT NULL default '0', value varchar(255) NOT NULL default '' ); CREATE INDEX prefix_question_dataset_items_definition_idx ON prefix_question_dataset_items (definition); diff --git a/mod/quiz/restorelibpre15.php b/mod/quiz/restorelibpre15.php index 214db9b5b7..b87d7d889c 100644 --- a/mod/quiz/restorelibpre15.php +++ b/mod/quiz/restorelibpre15.php @@ -1198,7 +1198,7 @@ //Now, build the question_dataset_ITEMS record structure $dataset_item->definition = $definitionid; - $dataset_item->number = backup_todb($di_info['#']['NUMBER']['0']['#']); + $dataset_item->itemnumber = backup_todb($di_info['#']['NUMBER']['0']['#']); $dataset_item->value = backup_todb($di_info['#']['VALUE']['0']['#']); //The structure is equal to the db, so insert the question_dataset_items diff --git a/mod/quiz/version.php b/mod/quiz/version.php index 0dbecbcc50..47cd36e42f 100644 --- a/mod/quiz/version.php +++ b/mod/quiz/version.php @@ -5,7 +5,7 @@ // This fragment is called by moodle_needs_upgrading() and /admin/index.php //////////////////////////////////////////////////////////////////////////////// -$module->version = 2006091201; // The (date) version of this module +$module->version = 2006091900; // The (date) version of this module $module->requires = 2006080900; // Requires this Moodle version $module->cron = 0; // How often should cron check this module (seconds)? diff --git a/question/backuplib.php b/question/backuplib.php index f4d9eedf6e..5a42ae43cb 100644 --- a/question/backuplib.php +++ b/question/backuplib.php @@ -277,7 +277,7 @@ foreach ($dataset_items as $dataset_item) { $status = $status &&fwrite ($bf,start_tag("DATASET_ITEM",$level+1,true)); //Print question_dataset contents - fwrite ($bf,full_tag("NUMBER",$level+2,false,$dataset_item->number)); + fwrite ($bf,full_tag("NUMBER",$level+2,false,$dataset_item->itemnumber)); fwrite ($bf,full_tag("VALUE",$level+2,false,$dataset_item->value)); //End dataset definition $status = $status &&fwrite ($bf,end_tag("DATASET_ITEM",$level+1,true)); diff --git a/question/format/webct/format.php b/question/format/webct/format.php index 0be61746f7..e2d2f91f0e 100644 --- a/question/format/webct/format.php +++ b/question/format/webct/format.php @@ -108,13 +108,13 @@ class qformat_webct_modified_calculated_qtype extends question_calculated_qtype // Set items and retrieve ->itemcout $item->definition = $datasetdef->id; - for ($item->number=1 ; isset($datasetdata->items["$item->number"]) ; ++$item->number) { - $item->value = $datasetdata->items["$item->number"]; + for ($item->itemnumber=1 ; isset($datasetdata->items["$item->itemnumber"]) ; ++$item->itemnumber) { + $item->value = $datasetdata->items["$item->itemnumber"]; if (!insert_record('question_dataset_items', $item)) { - error("Unable to insert dataset item $item->number with $item->value for $datasetdef->name"); + error("Unable to insert dataset item $item->itemnumber with $item->value for $datasetdef->name"); } } - $datasetdef->itemcount = $item->number - 1; + $datasetdef->itemcount = $item->itemnumber - 1; // Retrieve ->options if (is_numeric($datasetdata->min) && is_numeric($datasetdata->max) diff --git a/question/restorelib.php b/question/restorelib.php index b46a3c9f03..0481a2ca56 100644 --- a/question/restorelib.php +++ b/question/restorelib.php @@ -568,7 +568,7 @@ //Now, build the question_dataset_ITEMS record structure $dataset_item = new stdClass; $dataset_item->definition = $definitionid; - $dataset_item->number = backup_todb($di_info['#']['NUMBER']['0']['#']); + $dataset_item->itemnumber = backup_todb($di_info['#']['NUMBER']['0']['#']); $dataset_item->value = backup_todb($di_info['#']['VALUE']['0']['#']); //The structure is equal to the db, so insert the question_dataset_items diff --git a/question/type/datasetdependent/abstractqtype.php b/question/type/datasetdependent/abstractqtype.php index 49c1609ef4..16fb812040 100644 --- a/question/type/datasetdependent/abstractqtype.php +++ b/question/type/datasetdependent/abstractqtype.php @@ -461,7 +461,7 @@ class question_dataset_dependent_questiontype extends default_questiontype { WHERE q.question = $question->id AND q.datasetdefinition = d.id AND d.id = i.definition - AND i.number = $datasetitem")) { + AND i.itemnumber = $datasetitem")) { error("Couldn't get the specified dataset for a dataset dependent " . "question! (question: {$question->id}, " . "datasetitem: {$datasetitem})"); diff --git a/question/type/datasetdependent/datasetitems.php b/question/type/datasetdependent/datasetitems.php index 36cc7d85e4..676a26f7f7 100644 --- a/question/type/datasetdependent/datasetitems.php +++ b/question/type/datasetdependent/datasetitems.php @@ -50,7 +50,7 @@ // Handle adding and removing of dataset items // This twisted condition should effectively stop resubmits caused by reloads if (isset($form->addbutton) && $maxnumber + 1 == $form->numbertoadd) { - $addeditem->number = $form->numbertoadd; + $addeditem->itemnumber = $form->numbertoadd; foreach ($form->definition as $key => $defid) { $addeditem->definition = $datasetdefs[$defid]->id; $addeditem->value = $form->value[$key]; @@ -76,7 +76,7 @@ } } // else Success: - $maxnumber = $addeditem->number; + $maxnumber = $addeditem->itemnumber; } else if (isset($form->deletebutton) && $maxnumber == $form->numbertodelete) { @@ -107,7 +107,7 @@ foreach ($datasetdefs as $defid => $datasetdef) { if (isset($datasetdef->id)) { $datasetdefs[$defid]->items = get_records_sql( // Use number as key!! - " SELECT number, definition, id, value + " SELECT itemnumber, definition, id, value FROM {$CFG->prefix}question_dataset_items WHERE definition = $datasetdef->id "); } @@ -123,7 +123,7 @@ $datasetitem->id = isset($datasetdefs[$defid]->items[$maxnumber + 1]->id) ? $datasetdefs[$defid]->items[$maxnumber + 1]->id : ''; - $datasetitem->number = $maxnumber + 1; + $datasetitem->itemnumber = $maxnumber + 1; if ($this->supports_dataset_item_generation()) { if (!empty($form->addbutton) || // If we added an item !isset($form->value) || // If we don't have a value -- 2.39.5