From 841dce1795a6450b5962aaf0b1023e78c1911a4a Mon Sep 17 00:00:00 2001 From: Simon Coggins Date: Wed, 13 Mar 2013 12:28:09 +1300 Subject: [PATCH] MDL-38450 mod: Fix upgrade warnings due to empty database field defaults --- mod/label/db/upgrade.php | 4 ++-- mod/survey/db/upgrade.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mod/label/db/upgrade.php b/mod/label/db/upgrade.php index b0bc1af42bb..2101e6b7b9b 100644 --- a/mod/label/db/upgrade.php +++ b/mod/label/db/upgrade.php @@ -91,8 +91,8 @@ function xmldb_label_upgrade($oldversion) { $table = new xmldb_table('label'); // Columns to change. $arrfields = array(); - $arrfields['name'] = new xmldb_field('name', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, '', 'course'); - $arrfields['intro'] = new xmldb_field('intro', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, '', 'name'); + $arrfields['name'] = new xmldb_field('name', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, 'course'); + $arrfields['intro'] = new xmldb_field('intro', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, 'name'); // Loop through columns and update the fields. foreach ($arrfields as $fieldname => $field) { diff --git a/mod/survey/db/upgrade.php b/mod/survey/db/upgrade.php index aca51f54360..08608663085 100644 --- a/mod/survey/db/upgrade.php +++ b/mod/survey/db/upgrade.php @@ -68,12 +68,12 @@ function xmldb_survey_upgrade($oldversion) { $arrtables['survey_questions'] = new xmldb_table('survey_questions'); // Columns to change. $arrfields = array(); - $arrfields['survey']['intro'] = new xmldb_field('intro', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, '', 'name'); - $arrfields['survey']['questions'] = new xmldb_field('questions', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, '', 'introformat'); + $arrfields['survey']['intro'] = new xmldb_field('intro', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, 'name'); + $arrfields['survey']['questions'] = new xmldb_field('questions', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, 'introformat'); $arrfields['survey_answers']['time'] = new xmldb_field('time', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'question'); - $arrfields['survey_answers']['answer1'] = new xmldb_field('answer1', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, '', 'time'); - $arrfields['survey_answers']['answer2'] = new xmldb_field('answer2', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, '', 'answer1'); - $arrfields['survey_questions']['intro'] = new xmldb_field('intro', XMLDB_TYPE_CHAR, '50', null, XMLDB_NOTNULL, null, '', 'multi'); + $arrfields['survey_answers']['answer1'] = new xmldb_field('answer1', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, 'time'); + $arrfields['survey_answers']['answer2'] = new xmldb_field('answer2', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, 'answer1'); + $arrfields['survey_questions']['intro'] = new xmldb_field('intro', XMLDB_TYPE_CHAR, '50', null, XMLDB_NOTNULL, null, null, 'multi'); // Loop through the tables. foreach ($arrtables as $tablename => $table) {