From: stronk7 <stronk7>
Date: Sat, 2 Sep 2006 22:37:38 +0000 (+0000)
Subject: course_sections->summary and course_sections->sequence can be NULLable (experimenting... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1331745826732b0ded9b467e9c362bdaba63638a;p=moodle.git

course_sections->summary and course_sections->sequence can be NULLable (experimenting....)
---

diff --git a/lib/db/install.xml b/lib/db/install.xml
index 3ad89ee214..b07893ffba 100644
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="lib/db" VERSION="20060901" COMMENT="XMLDB file for core Moodle tables"
+<XMLDB PATH="lib/db" VERSION="20060902" COMMENT="XMLDB file for core Moodle tables"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
@@ -157,8 +157,8 @@
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="course"/>
         <FIELD NAME="course" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="section"/>
         <FIELD NAME="section" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="course" NEXT="summary"/>
-        <FIELD NAME="summary" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="section" NEXT="sequence"/>
-        <FIELD NAME="sequence" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="summary" NEXT="visible"/>
+        <FIELD NAME="summary" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false" ENUM="false" PREVIOUS="section" NEXT="sequence"/>
+        <FIELD NAME="sequence" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false" ENUM="false" PREVIOUS="summary" NEXT="visible"/>
         <FIELD NAME="visible" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="false" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="sequence"/>
       </FIELDS>
       <KEYS>
diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index b0e3c18c19..eae85f8967 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2181,6 +2181,11 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE {$CFG->prefix}user CHANGE description description text NULL AFTER url");
     }
 
+    if ($oldversion < 2006090200) {
+        execute_sql("ALTER TABLE {$CFG->prefix}course_sections CHANGE summary summary text NULL AFTER section");
+        execute_sql("ALTER TABLE {$CFG->prefix}course_sections CHANGE sequence sequence text NULL AFTER section");
+    }
+
     return $result;
 }
 
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index d67d027561..a82e0adcb5 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -178,8 +178,8 @@ CREATE TABLE `prefix_course_sections` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `course` int(10) unsigned NOT NULL default '0',
   `section` int(10) unsigned NOT NULL default '0',
-  `summary` text NOT NULL default '',
-  `sequence` text NOT NULL default '',
+  `summary` text,
+  `sequence` text,
   `visible` tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (`id`),
   KEY `coursesection` (course,section)
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 71fdcfa492..7b5111a240 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1779,6 +1779,13 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE {$CFG->prefix}user ALTER COLUMN description DROP DEFAULT");
     }
 
+    if ($oldversion < 2006090200) {
+        execute_sql("ALTER TABLE {$CFG->prefix}course_sections ALTER COLUMN summary DROP NOT NULL");
+        execute_sql("ALTER TABLE {$CFG->prefix}course_sections ALTER COLUMN summary DROP DEFAULT");
+        execute_sql("ALTER TABLE {$CFG->prefix}course_sections ALTER COLUMN sequence DROP NOT NULL");
+        execute_sql("ALTER TABLE {$CFG->prefix}course_sections ALTER COLUMN sequence DROP DEFAULT");
+    }
+
     return $result;
 }
 
diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 4c0295306b..65f752fb8d 100644
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -117,8 +117,8 @@ CREATE TABLE prefix_course_sections (
    id SERIAL PRIMARY KEY,
    course integer NOT NULL default '0',
    section integer NOT NULL default '0',
-   summary text NOT NULL default '',
-   sequence text NOT NULL default '',
+   summary text,
+   sequence text,
    visible integer NOT NULL default '1'
 );