Email digest feature step 1: Database schema and upgrade

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 25deba5001fc42daf3f8fd5135b47f3ee88ef537..5990efad0317e439859c337516f9b43b4ee5d3a4 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -770,6 +770,20 @@ function main_upgrade($oldversion=0) {
         set_field('course', 'students', get_string('users'), 'id', $site->id);
     }
 
+    if ($oldversion < 2004060100) {
+        set_config('digestmailtime', 0);
+        table_column('user', "", 'maildigest', 'tinyint', '1', '', '0', 'not null', 'mailformat');
+        modify_database('', "CREATE TABLE `prefix_forum_queue` (
+                                `id` int(11) unsigned NOT NULL auto_increment,
+                                `userid` int(11) unsigned default 0 NOT NULL,
+                                `discussionid` int(11) unsigned default 0 NOT NULL,
+                                `postid` int(11) unsigned default 0 NOT NULL,
+                                PRIMARY KEY  (`id`),
+                                KEY `user` (userid),
+                                KEY `post` (postid),
+                              ) TYPE=MyISAM COMMENT='For keeping track of posts that will be mailed in digest form';");
+    }
+
     return $result;
 
 }

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 5405ab5fdc5800a5bce2d25188122be5d7e7794d..391ac4fb0cef9b778e37c29fe8340cacad9bbc30 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -333,6 +333,7 @@ CREATE TABLE `prefix_user` (
   `url` varchar(255) default NULL,
   `description` text,
   `mailformat` tinyint(1) unsigned NOT NULL default '1',
+  `maildigest` tinyint(1) unsigned NOT NULL default '0',
   `maildisplay` tinyint(2) unsigned NOT NULL default '2',
   `htmleditor` tinyint(1) unsigned NOT NULL default '1',
   `autosubscribe` tinyint(1) unsigned NOT NULL default '1',

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 87e2acd43cb088b411b4946f1c44358875aa55d6..2e799132a09736a7735977b6034597b6dc30e928 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -512,6 +512,17 @@ function main_upgrade($oldversion=0) {
         set_field('course', 'students', get_string('users'), 'id', $site->id);
     }
 
+    if ($oldversion < 2004060100) {
+        set_config('digestmailtime', 0);
+        table_column('user', "", 'maildigest', 'smallint', '1', '', '0', 'not null', 'mailformat');
+        modify_database('', "CREATE TABLE `prefix_forum_queue` (
+                                id SERIAL PRIMARY KEY,
+                                userid integer default 0 NOT NULL,
+                                discussionid integer default 0 NOT NULL,
+                                postid integer default 0 NOT NULL
+                              );");
+    }
+
     return $result;
 
 }

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index e0237d70f0489232e5f88a4bd3360209e3d55055..3034f5781c992f51fc35b04be8f44495128fdb23 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -223,6 +223,7 @@ CREATE TABLE prefix_user (
    url varchar(255) default NULL,
    description text,
    mailformat integer NOT NULL default '1',
+   maildigest integer NOT NULL default '0',
    maildisplay integer NOT NULL default '2',
    htmleditor integer NOT NULL default '1',
    autosubscribe integer NOT NULL default '1',

diff --git a/version.php b/version.php
index 97346c94fcdd7f1ac9cf67fe36b02e27b0ef0f62..e97d948e31e5c4db1bb13bdf80be779e2af5b5c4 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 = 2004053000;   // The current version is a date (YYYYMMDDXX)
+$version = 2004060100;   // The current version is a date (YYYYMMDDXX)
 
 $release = "1.4 development";   // User-friendly version number