Now cache_text->formattedtext is a longtext again.

(both PG and the UTF8 migration script were
working with it as text, so impact should be minimal)

diff --git a/lib/db/install.xml b/lib/db/install.xml
index 12bd206288ed503502750ec1a9b539bae9b4d3e8..b6c4283f88cd88b9c3e49c6b699fba26f4fe8e39 100644 (file)
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -250,7 +250,7 @@
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="md5key"/>
         <FIELD NAME="md5key" TYPE="char" LENGTH="32" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="formattedtext"/>
-        <FIELD NAME="formattedtext" TYPE="binary" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="md5key" NEXT="timemodified"/>
+        <FIELD NAME="formattedtext" TYPE="text" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="md5key" NEXT="timemodified"/>
         <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="formattedtext"/>
       </FIELDS>
       <KEYS>
@@ -1092,4 +1092,4 @@
       </SENTENCES>
     </STATEMENT>
   </STATEMENTS>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index aa6f5e99e12360bcda4ab7090ebb7843c6142f9f..27fa0cb9e470e98f62e77297e701c1151733a94b 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2291,6 +2291,11 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE `{$CFG->prefix}context` ADD UNIQUE INDEX `contextlevel-instanceid` (`contextlevel`, `instanceid`)",false);
     }
 
+    if ($oldversion < 2006092201) {
+        execute_sql('TRUNCATE TABLE '.$CFG->prefix.'cache_text', true);
+        table_column('cache_text','formattedtext','formattedtext','longtext','','','','not null');
+    }
+
 
     return $result;
 }

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 112652196b13dd6520f2dd407c14640b34443ccf..06e2102652efc2d8ab9554146024e154cb313bdf 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -274,7 +274,7 @@ CREATE TABLE `prefix_cache_filters` (
 CREATE TABLE `prefix_cache_text` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `md5key` varchar(32) NOT NULL default '',
-  `formattedtext` longblob NOT NULL default '',
+  `formattedtext` longtext NOT NULL default '',
   `timemodified` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `md5key` (`md5key`)