Increasing log_display->field because sql_concat() (one

wrapper over ADOdb Concat() generates really long
expressions for MSSQL.

diff --git a/lib/db/install.xml b/lib/db/install.xml
index ba2d3f41904eb7a3c2ab99a14da41240cbc43c99..07519e4959b28d4def6d2de9dad99c35b5d9a0ed 100644 (file)
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="lib/db" VERSION="20060924" COMMENT="XMLDB file for core Moodle tables"
+<XMLDB PATH="lib/db" VERSION="20060926" COMMENT="XMLDB file for core Moodle tables"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
@@ -404,7 +404,7 @@
         <FIELD NAME="module" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="action"/>
         <FIELD NAME="action" TYPE="char" LENGTH="40" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="module" NEXT="mtable"/>
         <FIELD NAME="mtable" TYPE="char" LENGTH="30" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="action" NEXT="field"/>
-        <FIELD NAME="field" TYPE="char" LENGTH="50" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="mtable"/>
+        <FIELD NAME="field" TYPE="char" LENGTH="200" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="mtable"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for log_display"/>

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 20f4be54eb9192650b3d2206994092c231b4a24a..f4a9bb7f2f5b4cad5716e8dbc8487dccb5b99b90 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2329,6 +2329,9 @@ function main_upgrade($oldversion=0) {
         execute_sql("CREATE UNIQUE INDEX {$CFG->prefix}role_sor_uix ON {$CFG->prefix}role (sortorder);", false);
     }
 
+    if ($oldversion < 2006092601) {
+        table_column('log_display', 'field', 'field', 'varchar', '200', '', '', 'not null', '');
+    }
 
     return $result;
 }

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 06e2102652efc2d8ab9554146024e154cb313bdf..b9f10efa6c0850aa4a9c7661a5cb9e6c525d24f5 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -437,7 +437,7 @@ CREATE TABLE `prefix_log_display` (
   `module` varchar(20) NOT NULL default '',
   `action` varchar(40) NOT NULL default '',
   `mtable` varchar(30) NOT NULL default '',
-  `field` varchar(50) NOT NULL default '',
+  `field` varchar(200) 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 e54ab2f319f79f7e215c956311eb26c006d84263..58e1c564a525fce9b58110d3e0bca0f27f35005a 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1954,6 +1954,9 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2006092601) {
+            table_column('log_display', 'field', 'field', 'varchar', '200', '', '', 'not null', '');
+    }
 
     return $result;
 }

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index ee3f1a95ef20e0bf004f2786e8b9b145b08b4067..98bf81c4bac65dda8d10ce883b461834033065a0 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -276,7 +276,7 @@ CREATE TABLE prefix_log_display (
    module varchar(20) NOT NULL default '',
    action varchar(40) NOT NULL default '',
    mtable varchar(30) NOT NULL default '',
-   field varchar(50) NOT NULL default ''
+   field varchar(200) NOT NULL default ''
 );
 CREATE INDEX prefix_log_display_moduleaction ON prefix_log_display (module,action);
 

diff --git a/version.php b/version.php
index 91c90fd74e92284dd801cab753cf477b5614d6cd..c71a1c7f734e278f518a44502f12e8a79cf15613 100644 (file)
--- 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 = 2006092600;  // YYYYMMDD = date
+   $version = 2006092601;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name