- transform some db fields from text to mediumtext (for large dbs); - #sessions.data, #user_cache.forbidden_categories and #user_cache.image_access_list

git-svn-id: http://piwigo.org/svn/trunk@2323 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 59 insertions, 5 deletions

diff --git a/install/db/68-database.php b/install/db/68-database.php
new file mode 100644
index 000000000..39283a7a2
--- /dev/null
+++ b/install/db/68-database.php
@@ -0,0 +1,55 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'Change type from text to mediumtext for #sessions.data #user_cache.forbidden_categories and #user_cache.image_access_list';
+
+include_once(PHPWG_ROOT_PATH.'include/constants.php');
+
+// +-----------------------------------------------------------------------+
+// |                            Upgrade content                            |
+// +-----------------------------------------------------------------------+
+
+$query = '
+ALTER TABLE '.SESSIONS_TABLE.'
+  MODIFY COLUMN data MEDIUMTEXT NOT NULL';
+pwg_query($query);
+
+$query = '
+ALTER TABLE '.USER_CACHE_TABLE.'
+  MODIFY COLUMN forbidden_categories MEDIUMTEXT,
+  MODIFY COLUMN image_access_list MEDIUMTEXT
+  ';
+pwg_query($query);
+
+echo
+"\n"
+.'"'.$upgrade_description.'"'.' ended'
+."\n"
+;
+
+?>
diff --git a/install/phpwebgallery_structure.sql b/install/phpwebgallery_structure.sql
index bb09e0fd1..01626af0c 100644
--- a/install/phpwebgallery_structure.sql
+++ b/install/phpwebgallery_structure.sql
@@ -266,7 +266,7 @@ CREATE TABLE `phpwebgallery_search` (
 DROP TABLE IF EXISTS `phpwebgallery_sessions`;
 CREATE TABLE `phpwebgallery_sessions` (
   `id` varchar(255) binary NOT NULL default '',
-  `data` text NOT NULL,
+  `data` mediumtext NOT NULL,
   `expiration` datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
@@ -327,10 +327,10 @@ DROP TABLE IF EXISTS `phpwebgallery_user_cache`;
 CREATE TABLE `phpwebgallery_user_cache` (
   `user_id` smallint(5) NOT NULL default '0',
   `need_update` enum('true','false') NOT NULL default 'true',
-  `forbidden_categories` text,
+  `forbidden_categories` mediumtext,
   `nb_total_images` mediumint(8) unsigned default NULL,
   `image_access_type` enum('NOT IN','IN') NOT NULL default 'NOT IN',
-  `image_access_list` text default NULL,
+  `image_access_list` mediumtext default NULL,
   PRIMARY KEY  (`user_id`)
 ) TYPE=MyISAM;
 
diff --git a/upgrade_feed.php b/upgrade_feed.php
index 3f1bc3972..44ccbe5db 100644
--- a/upgrade_feed.php
+++ b/upgrade_feed.php
@@ -26,7 +26,6 @@ define('PHPWG_ROOT_PATH', './');
 include_once(PHPWG_ROOT_PATH.'include/functions.inc.php');
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php');
-include(PHPWG_ROOT_PATH.'include/template.php');
 include(PHPWG_ROOT_PATH.'include/mysql.inc.php');
 
 // +-----------------------------------------------------------------------+
@@ -71,7 +70,7 @@ echo count($to_apply).' upgrades to apply';
 foreach ($to_apply as $upgrade_id)
 {
   unset($upgrade_description);
-  
+
   echo "\n\n";
   echo '=== upgrade '.$upgrade_id."\n";