Get rid of the enumerated type on the course formats, so that

we can think about adding custom course formats into course/format

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index dca38c03436a3da36530ecd7cdfae37b9cd8b6c6..3f37f322dd4f571b83dfcfedbe4b6b59cc87a26d 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -436,6 +436,10 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2003081001) {
+        table_column("course", "format", "format", "varchar", "10", "", "topics");
+    }
+
     return $result;
 
 }

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 7b2dd896ab292e66408a0d38a8648ba95acf55dd..70f5e8787d8503313783ee13596be243eadbeabe 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -35,7 +35,7 @@ CREATE TABLE `prefix_course` (
   `fullname` varchar(254) NOT NULL default '',
   `shortname` varchar(15) NOT NULL default '',
   `summary` text NOT NULL,
-  `format` enum('weeks','social','topics') NOT NULL default 'weeks',
+  `format` varchar(10) NOT NULL default 'topics',
   `modinfo` text NOT NULL,
   `newsitems` smallint(5) unsigned NOT NULL default '1',
   `teacher` varchar(100) NOT NULL default 'Teacher',

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index fe560589a1e08316f918532a2bd72f2cc7511f21..e4749cfe20e38531b44ca385e95c530ddde016a3 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -208,6 +208,7 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+
     return $result;
 }
 ?>    

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 39ef50efe90dcfefb7362e9e0679289c4d6b1668..09abc3efaa8343167598658802dd1d108bbe6c85 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -13,7 +13,7 @@ CREATE TABLE prefix_course (
    fullname varchar(254) NOT NULL default '',
    shortname varchar(15) NOT NULL default '',
    summary text NOT NULL default '',
-   format varchar(10) CHECK (format IN ('weeks','social','topics')) NOT NULL default 'weeks',
+   format varchar(10) NOT NULL default 'topics',
    modinfo text NOT NULL default '',
    newsitems integer NOT NULL default '1',
    teacher varchar(100) NOT NULL default 'Teacher',

diff --git a/version.php b/version.php
index f1a5ca221171a3ee7a10fb2de407f38caafb0ef0..40a5c66e714b97ca6c65ff17708c29ba78f17b23 100644 (file)
--- a/version.php
+++ b/version.php
@@ -5,7 +5,7 @@
 // database to determine whether upgrades should
 // be performed (see lib/db/*.php)
 
-$version = 2003081000;   // The current version is a date (YYYYMMDDXX)
+$version = 2003081001;   // The current version is a date (YYYYMMDDXX)
 
 $release = "1.1 development";  // User-friendly version number