fixing up the stats table enums

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 7fccceb714c9f5debbab6ea1eaf158ad2d9fcc54..112652196b13dd6520f2dd407c14640b34443ccf 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -750,7 +750,7 @@ CREATE TABLE `prefix_stats_daily` (
    `courseid` int(10) unsigned NOT NULL default 0,
    `roleid` int(10) unsigned NOT NULL default 0,
    `timeend` int(10) unsigned NOT NULL default 0,
-   `stattype` enum('enrolments', 'activity', 'logins') NOT NULL default 'logins',
+   `stattype` enum('enrolments', 'activity', 'logins') NOT NULL default 'activity',
    `stat1` int(10) unsigned NOT NULL default 0,
    `stat2` int(10) unsigned NOT NULL default 0,
    PRIMARY KEY (`id`),
@@ -763,7 +763,7 @@ CREATE TABLE prefix_stats_weekly (
    `courseid` int(10) unsigned NOT NULL default 0,
    `roleid` int(10) unsigned NOT NULL default 0,
    `timeend` int(10) unsigned NOT NULL default 0,
-   `stattype` enum('enrolments', 'activity', 'logins') NOT NULL default 'logins',
+   `stattype` enum('enrolments', 'activity', 'logins') NOT NULL default 'activity',
    `stat1` int(10) unsigned NOT NULL default 0,
    `stat2` int(10) unsigned NOT NULL default 0,
    PRIMARY KEY (`id`),
@@ -776,7 +776,7 @@ CREATE TABLE prefix_stats_monthly (
    `courseid` int(10) unsigned NOT NULL default 0,
    `roleid` int(10) unsigned NOT NULL default 0,
    `timeend` int(10) unsigned NOT NULL default 0,
-   `stattype` enum('enrolments', 'activity', 'logins') NOT NULL default 'logins',
+   `stattype` enum('enrolments', 'activity', 'logins') NOT NULL default 'activity',
    `stat1` int(10) unsigned NOT NULL default 0,
    `stat2` int(10) unsigned NOT NULL default 0,
    PRIMARY KEY (`id`),

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index c2745b9ce04ce16638837bd3fbdb9863038d9600..ee3f1a95ef20e0bf004f2786e8b9b145b08b4067 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -532,7 +532,7 @@ CREATE TABLE prefix_stats_daily (
    courseid INTEGER NOT NULL default 0,
    roleid INTEGER NOT NULL default 0,
    timeend INTEGER NOT NULL default 0,
-   stattype varchar(20) NOT NULL default 'logins',
+   stattype varchar(20) NOT NULL default 'activity',
    stat1 INTEGER NOT NULL default 0,
    stat2 INTEGER NOT NULL default 0,
    CHECK (stattype::text = 'enrolments' OR stattype::text = 'activity' OR stattype::text = 'logins')
@@ -546,7 +546,7 @@ CREATE TABLE prefix_stats_weekly (
    courseid INTEGER NOT NULL default 0,
    roleid INTEGER NOT NULL default 0,
    timeend INTEGER NOT NULL default 0,
-   stattype varchar(20) NOT NULL default '',
+   stattype varchar(20) NOT NULL default 'activity',
    stat1 INTEGER NOT NULL default 0,
    stat2 INTEGER NOT NULL default 0,
    CHECK (stattype::text = 'enrolments' OR stattype::text = 'activity' OR stattype::text = 'logins')
@@ -560,7 +560,7 @@ CREATE TABLE prefix_stats_monthly (
    courseid INTEGER NOT NULL default 0,
    roleid INTEGER NOT NULL default 0,
    timeend INTEGER NOT NULL default 0,
-   stattype varchar(20) NOT NULL default '',
+   stattype varchar(20) NOT NULL default 'activity',
    stat1 INTEGER NOT NULL default 0,
    stat2 INTEGER NOT NULL default 0,
    CHECK (stattype::text = 'enrolments' OR stattype::text = 'activity' OR stattype::text = 'logins')

diff --git a/lib/statslib.php b/lib/statslib.php
index 5c5a58f367e957ce52bb8fb87b38c64536dc4107..65ad8517569fb232dd38b9628ae866445ae988c2 100644 (file)
--- a/lib/statslib.php
+++ b/lib/statslib.php
@@ -1190,7 +1190,7 @@ function stats_upgrade_table_for_roles ($period) {
     $table->addFieldInfo('timeend', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED,
         XMLDB_NOTNULL, null, null, null, null);
     $table->addFieldInfo('stattype', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL,
-        null, XMLDB_ENUM, array('enrolments', 'activity', 'logins'), null);
+        null, XMLDB_ENUM, array('enrolments', 'activity', 'logins'), 'activity');
     $table->addFieldInfo('stat1', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED,
         XMLDB_NOTNULL, null, null, null, null);
     $table->addFieldInfo('stat2', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED,