MDL-10821, making configdata nullable

diff --git a/blocks/db/install.xml b/blocks/db/install.xml
index b231f37fc6593131a1b41ad4868e3a11b7a72f7f..ec2fbc3284c666d57f7b79cf9320bc979c4b26ed 100644 (file)
--- a/blocks/db/install.xml
+++ b/blocks/db/install.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="blocks/db" VERSION="20060809" COMMENT="XMLDB file for Moodle block tables">
+<XMLDB PATH="blocks/db" VERSION="20070813" COMMENT="XMLDB file for Moodle block tables"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
+>
   <TABLES>
     <TABLE NAME="block" COMMENT="to store installed blocks" NEXT="block_instance">
       <FIELDS>
@@ -24,7 +27,7 @@
         <FIELD NAME="position" TYPE="char" LENGTH="10" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="pagetype" NEXT="weight"/>
         <FIELD NAME="weight" TYPE="int" LENGTH="3" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="position" NEXT="visible"/>
         <FIELD NAME="visible" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="weight" NEXT="configdata"/>
-        <FIELD NAME="configdata" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="visible"/>
+        <FIELD NAME="configdata" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false" ENUM="false" PREVIOUS="visible"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="blockid"/>

diff --git a/blocks/db/upgrade.php b/blocks/db/upgrade.php
index 9891ea3a99d1a802e1a58461d4cfe5d0e1bdf103..a92117124b7e8cea9c0328ab076ebba5e978d6bb 100644 (file)
--- a/blocks/db/upgrade.php
+++ b/blocks/db/upgrade.php
@@ -32,7 +32,21 @@ function xmldb_blocks_upgrade($oldversion=0) {
 ///     $result = result of "/lib/ddllib.php" function calls
 /// }
 
+    if ($result && $oldversion < 2007081300) {
+
+    /// Changing nullability of field configdata on table block_instance to null
+        $table = new XMLDBTable('block_instance');
+        $field = new XMLDBField('configdata');
+        $field->setAttributes(XMLDB_TYPE_TEXT, 'small', null, null, null, null, null, null, 'visible');
+
+    /// Launch change of nullability for field configdata
+        $result = $result && change_field_notnull($table, $field);
+    }
+
+
     return $result;
 }
 
+
+
 ?>

diff --git a/blocks/version.php b/blocks/version.php
index 2483818935b9d40691c104ba1d571d192d4a5604..20c50fa7a96003ca4f920e225af59d5c7920b6f9 100644 (file)
--- a/blocks/version.php
+++ b/blocks/version.php
@@ -5,4 +5,4 @@
 // database (blocks_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)
 
-$blocks_version = 2005090201;   // The current version is a date (YYYYMMDDXX)
+$blocks_version = 2007081300;   // The current version is a date (YYYYMMDDXX)