schema files for stats changes (install.xml still to come). Credit: Nigel McNie ...

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 9cbeee2b5284be0103ceb02e2bfbf55fe6c9c44c..c450b6853ba1edc0212a443b8d8744ec59e88eff 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -748,17 +748,11 @@ CREATE TABLE `adodb_logsql` (
 CREATE TABLE `prefix_stats_daily` (
    `id` int(10) unsigned NOT NULL auto_increment,
    `courseid` int(10) unsigned NOT NULL default 0,
+   `roleid` int(10) unsigned NOT NULL default 0,
    `timeend` int(10) unsigned NOT NULL default 0,
-   `students` int(10) unsigned NOT NULL default 0,
-   `teachers` int(10) unsigned NOT NULL default 0,
-   `activestudents` int(10) unsigned NOT NULL default 0,
-   `activeteachers` int(10) unsigned NOT NULL default 0,
-   `studentreads` int(10) unsigned NOT NULL default 0,
-   `studentwrites` int(10) unsigned NOT NULL default 0,
-   `teacherreads` int(10) unsigned NOT NULL default 0,
-   `teacherwrites` int(10) unsigned NOT NULL default 0,
-   `logins` int(10) unsigned NOT NULL default 0,
-   `uniquelogins` int(10) unsigned NOT NULL default 0,
+   `stattype` enum('enrolments', 'activity', 'logins') NOT NULL default 'logins',
+   `stat1` int(10) unsigned NOT NULL default 0,
+   `stat2` int(10) unsigned NOT NULL default 0,
    PRIMARY KEY (`id`),
    KEY `courseid` (`courseid`),
    KEY `timeend` (`timeend`)
@@ -767,17 +761,11 @@ CREATE TABLE `prefix_stats_daily` (
 CREATE TABLE prefix_stats_weekly (
    `id` int(10) unsigned NOT NULL auto_increment,
    `courseid` int(10) unsigned NOT NULL default 0,
+   `roleid` int(10) unsigned NOT NULL default 0,
    `timeend` int(10) unsigned NOT NULL default 0,
-   `students` int(10) unsigned NOT NULL default 0,
-   `teachers` int(10) unsigned NOT NULL default 0,
-   `activestudents` int(10) unsigned NOT NULL default 0,
-   `activeteachers` int(10) unsigned NOT NULL default 0,
-   `studentreads` int(10) unsigned NOT NULL default 0,
-   `studentwrites` int(10) unsigned NOT NULL default 0,
-   `teacherreads` int(10) unsigned NOT NULL default 0,
-   `teacherwrites` int(10) unsigned NOT NULL default 0,
-   `logins` int(10) unsigned NOT NULL default 0,
-   `uniquelogins` int(10) unsigned NOT NULL default 0,
+   `stattype` enum('enrolments', 'activity', 'logins') NOT NULL default 'logins',
+   `stat1` int(10) unsigned NOT NULL default 0,
+   `stat2` int(10) unsigned NOT NULL default 0,
    PRIMARY KEY (`id`),
    KEY `courseid` (`courseid`),
    KEY `timeend` (`timeend`)
@@ -786,17 +774,11 @@ CREATE TABLE prefix_stats_weekly (
 CREATE TABLE prefix_stats_monthly (
    `id` int(10) unsigned NOT NULL auto_increment,
    `courseid` int(10) unsigned NOT NULL default 0,
+   `roleid` int(10) unsigned NOT NULL default 0,
    `timeend` int(10) unsigned NOT NULL default 0,
-   `students` int(10) unsigned NOT NULL default 0,
-   `teachers` int(10) unsigned NOT NULL default 0,
-   `activestudents` int(10) unsigned NOT NULL default 0,
-   `activeteachers` int(10) unsigned NOT NULL default 0,
-   `studentreads` int(10) unsigned NOT NULL default 0,
-   `studentwrites` int(10) unsigned NOT NULL default 0,
-   `teacherreads` int(10) unsigned NOT NULL default 0,
-   `teacherwrites` int(10) unsigned NOT NULL default 0,
-   `logins` int(10) unsigned NOT NULL default 0,
-   `uniquelogins` int(10) unsigned NOT NULL default 0,
+   `stattype` enum('enrolments', 'activity', 'logins') NOT NULL default 'logins',
+   `stat1` int(10) unsigned NOT NULL default 0,
+   `stat2` int(10) unsigned NOT NULL default 0,
    PRIMARY KEY (`id`),
    KEY `courseid` (`courseid`),
    KEY `timeend` (`timeend`)

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index e9985ecafb6a26248f81367a8bc3cda96f367369..ec52b9362e6afa527ef763f5f632821f2d779f7c 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -530,17 +530,12 @@ CREATE TABLE adodb_logsql (
 CREATE TABLE prefix_stats_daily (
    id SERIAL PRIMARY KEY,
    courseid INTEGER NOT NULL default 0,
+   roleid INTEGER NOT NULL default 0,
    timeend INTEGER NOT NULL default 0,
-   students INTEGER NOT NULL default 0,
-   teachers INTEGER NOT NULL default 0,
-   activestudents INTEGER NOT NULL default 0,
-   activeteachers INTEGER NOT NULL default 0,
-   studentreads INTEGER NOT NULL default 0,
-   studentwrites INTEGER NOT NULL default 0,
-   teacherreads INTEGER NOT NULL default 0,
-   teacherwrites INTEGER NOT NULL default 0,
-   logins INTEGER NOT NULL default 0,
-   uniquelogins INTEGER NOT NULL default 0
+   stattype varchar(20) NOT NULL default 'logins',
+   stat1 INTEGER NOT NULL default 0,
+   stat2 INTEGER NOT NULL default 0,
+   CHECK (stattype::text = 'enrolments' OR stattype::text = 'activity' OR stattype::text = 'logins')
 );
 
 CREATE INDEX prefix_stats_daily_courseid_idx ON prefix_stats_daily (courseid);
@@ -549,17 +544,12 @@ CREATE INDEX prefix_stats_daily_timeend_idx ON prefix_stats_daily (timeend);
 CREATE TABLE prefix_stats_weekly (
    id SERIAL PRIMARY KEY,
    courseid INTEGER NOT NULL default 0,
+   roleid INTEGER NOT NULL default 0,
    timeend INTEGER NOT NULL default 0,
-   students INTEGER NOT NULL default 0,
-   teachers INTEGER NOT NULL default 0,
-   activestudents INTEGER NOT NULL default 0,
-   activeteachers INTEGER NOT NULL default 0,
-   studentreads INTEGER NOT NULL default 0,
-   studentwrites INTEGER NOT NULL default 0,
-   teacherreads INTEGER NOT NULL default 0,
-   teacherwrites INTEGER NOT NULL default 0,
-   logins INTEGER NOT NULL default 0,
-   uniquelogins INTEGER NOT NULL default 0
+   stattype varchar(20) NOT NULL default '',
+   stat1 INTEGER NOT NULL default 0,
+   stat2 INTEGER NOT NULL default 0,
+   CHECK (stattype::text = 'enrolments' OR stattype::text = 'activity' OR stattype::text = 'logins')
 );
 
 CREATE INDEX prefix_stats_weekly_courseid_idx ON prefix_stats_weekly (courseid);
@@ -568,17 +558,12 @@ CREATE INDEX prefix_stats_weekly_timeend_idx ON prefix_stats_weekly (timeend);
 CREATE TABLE prefix_stats_monthly (
    id SERIAL PRIMARY KEY,
    courseid INTEGER NOT NULL default 0,
+   roleid INTEGER NOT NULL default 0,
    timeend INTEGER NOT NULL default 0,
-   students INTEGER NOT NULL default 0,
-   teachers INTEGER NOT NULL default 0,
-   activestudents INTEGER NOT NULL default 0,
-   activeteachers INTEGER NOT NULL default 0,
-   studentreads INTEGER NOT NULL default 0,
-   studentwrites INTEGER NOT NULL default 0,
-   teacherreads INTEGER NOT NULL default 0,
-   teacherwrites INTEGER NOT NULL default 0,
-   logins INTEGER NOT NULL default 0,
-   uniquelogins INTEGER NOT NULL default 0
+   stattype varchar(20) NOT NULL default '',
+   stat1 INTEGER NOT NULL default 0,
+   stat2 INTEGER NOT NULL default 0,
+   CHECK (stattype::text = 'enrolments' OR stattype::text = 'activity' OR stattype::text = 'logins')
 );
 
 CREATE INDEX prefix_stats_monthly_courseid_idx ON prefix_stats_monthly (courseid);