From 3054f2faf299d139d2230a6c7de1db5d28a31bb9 Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Wed, 24 May 2006 05:02:09 +0000 Subject: [PATCH] renaming reads and writes to statsreads and statswrites --- lib/db/mysql.php | 26 ++++++++++++++++++++------ lib/db/mysql.sql | 12 ++++++------ lib/db/postgres7.php | 27 ++++++++++++++++++++------- lib/db/postgres7.sql | 12 ++++++------ version.php | 2 +- 5 files changed, 53 insertions(+), 26 deletions(-) diff --git a/lib/db/mysql.php b/lib/db/mysql.php index f5ddb843d15..5571764dfa8 100644 --- a/lib/db/mysql.php +++ b/lib/db/mysql.php @@ -1589,8 +1589,8 @@ function main_upgrade($oldversion=0) { `userid` int(10) unsigned NOT NULL default 0, `roleid` int(10) unsigned NOT NULL default 0, `timeend` int(10) unsigned NOT NULL default 0, - `reads` int(10) unsigned NOT NULL default 0, - `writes` int(10) unsigned NOT NULL default 0, + `statsreads` int(10) unsigned NOT NULL default 0, + `statswrites` int(10) unsigned NOT NULL default 0, `stattype` varchar(30) NOT NULL default '', PRIMARY KEY (`id`), KEY `courseid` (`courseid`), @@ -1605,8 +1605,8 @@ function main_upgrade($oldversion=0) { `userid` int(10) unsigned NOT NULL default 0, `roleid` int(10) unsigned NOT NULL default 0, `timeend` int(10) unsigned NOT NULL default 0, - `reads` int(10) unsigned NOT NULL default 0, - `writes` int(10) unsigned NOT NULL default 0, + `statsreads` int(10) unsigned NOT NULL default 0, + `statswrites` int(10) unsigned NOT NULL default 0, `stattype` varchar(30) NOT NULL default '', PRIMARY KEY (`id`), KEY `courseid` (`courseid`), @@ -1621,8 +1621,8 @@ function main_upgrade($oldversion=0) { `userid` int(10) unsigned NOT NULL default 0, `roleid` int(10) unsigned NOT NULL default 0, `timeend` int(10) unsigned NOT NULL default 0, - `reads` int(10) unsigned NOT NULL default 0, - `writes` int(10) unsigned NOT NULL default 0, + `statsreads` int(10) unsigned NOT NULL default 0, + `statswrites` int(10) unsigned NOT NULL default 0, `stattype` varchar(30) NOT NULL default '', PRIMARY KEY (`id`), KEY `courseid` (`courseid`), @@ -1950,6 +1950,20 @@ function main_upgrade($oldversion=0) { table_column('sessions', 'data', 'data', 'mediumtext', '', '', '', 'not null'); } + // renaming of reads and writes for stats_user_xyz + if ($oldversion < 2006050503) { // change this later + + // we are using this because we want silent updates + + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_daily` CHANGE `reads` statsreads int(10) unsigned NOT NULL default 0", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_daily` CHANGE `writes` statswrites int(10) unsigned NOT NULL default 0", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_weekly` CHANGE `reads` statsreads int(10) unsigned NOT NULL default 0", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_weekly` CHANGE `writes` statswrites int(10) unsigned NOT NULL default 0", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_monthly` CHANGE `reads` statsreads int(10) unsigned NOT NULL default 0", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_monthly` CHANGE `writes` statswrites int(10) unsigned NOT NULL default 0", false); + + } + return $result; } diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql index 016ea654e6f..aaa322891c1 100644 --- a/lib/db/mysql.sql +++ b/lib/db/mysql.sql @@ -804,8 +804,8 @@ CREATE TABLE prefix_stats_user_daily ( `userid` int(10) unsigned NOT NULL default 0, `roleid` int(10) unsigned NOT NULL default 0, `timeend` int(10) unsigned NOT NULL default 0, - `reads` int(10) unsigned NOT NULL default 0, - `writes` int(10) unsigned NOT NULL default 0, + `statsreads` int(10) unsigned NOT NULL default 0, + `statswrites` int(10) unsigned NOT NULL default 0, `stattype` varchar(30) NOT NULL default '', PRIMARY KEY (`id`), KEY `courseid` (`courseid`), @@ -820,8 +820,8 @@ CREATE TABLE prefix_stats_user_weekly ( `userid` int(10) unsigned NOT NULL default 0, `roleid` int(10) unsigned NOT NULL default 0, `timeend` int(10) unsigned NOT NULL default 0, - `reads` int(10) unsigned NOT NULL default 0, - `writes` int(10) unsigned NOT NULL default 0, + `statsreads` int(10) unsigned NOT NULL default 0, + `statswrites` int(10) unsigned NOT NULL default 0, `stattype` varchar(30) NOT NULL default '', PRIMARY KEY (`id`), KEY `courseid` (`courseid`), @@ -836,8 +836,8 @@ CREATE TABLE prefix_stats_user_monthly ( `userid` int(10) unsigned NOT NULL default 0, `roleid` int(10) unsigned NOT NULL default 0, `timeend` int(10) unsigned NOT NULL default 0, - `reads` int(10) unsigned NOT NULL default 0, - `writes` int(10) unsigned NOT NULL default 0, + `statsreads` int(10) unsigned NOT NULL default 0, + `statswrites` int(10) unsigned NOT NULL default 0, `stattype` varchar(30) NOT NULL default '', PRIMARY KEY (`id`), KEY `courseid` (`courseid`), diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php index 58e4bf5dcdf..de197d1ec18 100644 --- a/lib/db/postgres7.php +++ b/lib/db/postgres7.php @@ -1332,8 +1332,8 @@ function main_upgrade($oldversion=0) { userid INTEGER NOT NULL default 0, roleid INTEGER NOT NULL default 0, timeend INTEGER NOT NULL default 0, - reads INTEGER NOT NULL default 0, - writes INTEGER NOT NULL default 0, + statsreads INTEGER NOT NULL default 0, + statswrites INTEGER NOT NULL default 0, stattype varchar(30) NOT NULL default '' );"); @@ -1348,8 +1348,8 @@ function main_upgrade($oldversion=0) { userid INTEGER NOT NULL default 0, roleid INTEGER NOT NULL default 0, timeend INTEGER NOT NULL default 0, - reads INTEGER NOT NULL default 0, - writes INTEGER NOT NULL default 0, + statsreads INTEGER NOT NULL default 0, + statswrites INTEGER NOT NULL default 0, stattype varchar(30) NOT NULL default '' );"); @@ -1364,8 +1364,8 @@ function main_upgrade($oldversion=0) { userid INTEGER NOT NULL default 0, roleid INTEGER NOT NULL default 0, timeend INTEGER NOT NULL default 0, - reads INTEGER NOT NULL default 0, - writes INTEGER NOT NULL default 0, + statsreads INTEGER NOT NULL default 0, + statswrites INTEGER NOT NULL default 0, stattype varchar(30) NOT NULL default '' );"); @@ -1577,8 +1577,21 @@ function main_upgrade($oldversion=0) { } + // renaming of reads and writes for stats_user_xyz + if ($oldversion < 2006050503) { // change this later + + // we are using this because we want silent updates + + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_daily` RENAME COLUMN reads TO statsreads", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_daily` RENAME COLUMN writes TO statswrites", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_weekly` RENAME COLUMN reads TO statsreads", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_weekly` RENAME COLUMN writes TO statswrites", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_monthly` RENAME COLUMN reads TO statsreads", false); + execute_sql("ALTER TABLE `{$CFG->prefix}stats_user_monthly` RENAME COLUMN writes TO statswrites", false); + + } return $result; } -?> \ No newline at end of file +?> diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql index 99c3723bfb4..8de856179c2 100644 --- a/lib/db/postgres7.sql +++ b/lib/db/postgres7.sql @@ -583,8 +583,8 @@ CREATE TABLE prefix_stats_user_daily ( userid INTEGER NOT NULL default 0, roleid INTEGER NOT NULL default 0, timeend INTEGER NOT NULL default 0, - reads INTEGER NOT NULL default 0, - writes INTEGER NOT NULL default 0, + statsreads INTEGER NOT NULL default 0, + statswrites INTEGER NOT NULL default 0, stattype varchar(30) NOT NULL default '' ); @@ -599,8 +599,8 @@ CREATE TABLE prefix_stats_user_weekly ( userid INTEGER NOT NULL default 0, roleid INTEGER NOT NULL default 0, timeend INTEGER NOT NULL default 0, - reads INTEGER NOT NULL default 0, - writes INTEGER NOT NULL default 0, + statsreads INTEGER NOT NULL default 0, + statswrites INTEGER NOT NULL default 0, stattype varchar(30) NOT NULL default '' ); @@ -615,8 +615,8 @@ CREATE TABLE prefix_stats_user_monthly ( userid INTEGER NOT NULL default 0, roleid INTEGER NOT NULL default 0, timeend INTEGER NOT NULL default 0, - reads INTEGER NOT NULL default 0, - writes INTEGER NOT NULL default 0, + statsreads INTEGER NOT NULL default 0, + statswrites INTEGER NOT NULL default 0, stattype varchar(30) NOT NULL default '' ); diff --git a/version.php b/version.php index a896877915b..c546e0439d7 100644 --- a/version.php +++ b/version.php @@ -6,7 +6,7 @@ // This is compared against the values stored in the database to determine // whether upgrades should be performed (see lib/db/*.php) - $version = 2006050502; // YYYYMMDD = date of the 1.6 branch (don't change) + $version = 2006050503; // YYYYMMDD = date of the 1.6 branch (don't change) // X = release number 1.6.[0,1,2,3...] // Y = micro-increments between releases