From e48f4e502dae537e4d781b21cf9a1301234e51d2 Mon Sep 17 00:00:00 2001
From: vyshane <vyshane>
Date: Fri, 5 May 2006 08:01:27 +0000
Subject: [PATCH] Fix for Bug #5419 - Inconsistency between log_display and log
 tables.

---
 lib/db/mysql.php     |  5 ++++-
 lib/db/mysql.sql     | 10 +++++-----
 lib/db/postgres7.php |  8 ++++++--
 lib/db/postgres7.sql |  2 +-
 version.php          |  4 ++--
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index f0447380889..d8f00adb928 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1921,7 +1921,6 @@ function main_upgrade($oldversion=0) {
         table_column('user','url','url','varchar','255','','','not null');
     }
     
-    
     if ($oldversion < 2006050400) {
 
         execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_deleted_idx;",false);
@@ -1943,6 +1942,10 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_email (email)",false);
     }
     
+    if ($oldversion < 2006050500) {
+        table_column('log', 'action', 'action', 'varchar', '40', '', '', 'not null');
+    }
+    
     return $result;
 }
 
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 3eaf44c6df7..7e6a8d97049 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -415,7 +415,7 @@ CREATE TABLE `prefix_log` (
   `course` int(10) unsigned NOT NULL default '0',
   `module` varchar(20) NOT NULL default '',
   `cmid` int(10) unsigned NOT NULL default '0',
-  `action` varchar(15) NOT NULL default '',
+  `action` varchar(40) NOT NULL default '',
   `url` varchar(100) NOT NULL default '',
   `info` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`id`),
@@ -433,10 +433,10 @@ CREATE TABLE `prefix_log` (
 
 CREATE TABLE `prefix_log_display` (
   `id` int(10) unsigned NOT NULL auto_increment,
-  `module` varchar(20) NOT NULL default '',
-  `action` varchar(20) NOT NULL default '',
-  `mtable` varchar(20) NOT NULL default '',
-  `field` varchar(40) NOT NULL default '',
+  `module` varchar(30) NOT NULL default '',
+  `action` varchar(40) NOT NULL default '',
+  `mtable` varchar(30) NOT NULL default '',
+  `field` varchar(50) NOT NULL default '',
    PRIMARY KEY  (`id`)
 ) TYPE=MyISAM COMMENT='For a particular module/action, specifies a moodle table/field.';
 ALTER TABLE prefix_log_display ADD UNIQUE `moduleaction`(`module` , `action`);
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index b1d783e8046..0a859399265 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1529,8 +1529,12 @@ function main_upgrade($oldversion=0) {
         modify_database('',"CREATE INDEX tags_typeuserid_idx ON prefix_tags (type, userid);");
         modify_database('',"CREATE INDEX tags_text_idx ON prefix_tags (text);");
     }
-
+    
+    if ($oldversion < 2006050500) {
+        table_column('log', 'action', 'action', 'varchar', '40', '', '', 'not null');
+    }
+    
     return $result;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 0026c15b98b..7742e45696a 100644
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -259,7 +259,7 @@ CREATE TABLE prefix_log (
    course integer NOT NULL default '0',
    module varchar(20) NOT NULL default '',
    cmid integer NOT NULL default '0',
-   action varchar(20) NOT NULL default '',
+   action varchar(40) NOT NULL default '',
    url varchar(100) NOT NULL default '',
    info varchar(255) NOT NULL default ''
 );
diff --git a/version.php b/version.php
index d4faccc87e4..f97de072877 100644
--- a/version.php
+++ b/version.php
@@ -6,9 +6,9 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006050400;  // YYYYMMDD = date
+   $version = 2006050500;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.6 Beta 5';    // Human-friendly version name
 
-?>
+?>
\ No newline at end of file