Make some columns smaller so that multi-column keys don't exceed 1024

bytes on some systems.

5 files changed, 67 insertions, 67 deletions

diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index bd2b5186..d1904181 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -46,7 +46,7 @@ class core_installer {
       $db->query("CREATE TABLE `graphics_rules` (
                    `id` int(9) NOT NULL auto_increment,
                    `priority` int(9) NOT NULL,
-                   `module_name` varchar(255) NOT NULL,
+                   `module_name` varchar(64) NOT NULL,
                    `target`  varchar(32) NOT NULL,
                    `operation` varchar(64) NOT NULL,
                    `args` varchar(255) default NULL,
@@ -106,7 +106,7 @@ class core_installer {
 
       $db->query("CREATE TABLE `modules` (
                    `id` int(9) NOT NULL auto_increment,
-                   `name` varchar(255) default NULL,
+                   `name` varchar(64) default NULL,
                    `version` int(9) default NULL,
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`name`))
@@ -114,7 +114,7 @@ class core_installer {
 
       $db->query("CREATE TABLE `permissions` (
                    `id` int(9) NOT NULL auto_increment,
-                   `name` varchar(255) default NULL,
+                   `name` varchar(64) default NULL,
                    `version` int(9) default NULL,
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`name`))
@@ -128,12 +128,12 @@ class core_installer {
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
       $db->query("CREATE TABLE `tasks` (
-                  `callback` varchar(255) default NULL,
+                  `callback` varchar(128) default NULL,
                   `context` text NOT NULL,
                   `done` boolean default 0,
                   `id` int(9) NOT NULL auto_increment,
                   `updated` int(9) default NULL,
-                  `name` varchar(255) default NULL,
+                  `name` varchar(128) default NULL,
                   `percent_complete` int(9) default 0,
                   `state` varchar(32) default NULL,
                   `status` varchar(255) default NULL,
@@ -142,8 +142,8 @@ class core_installer {
 
       $db->query("CREATE TABLE `vars` (
                    `id` int(9) NOT NULL auto_increment,
-                   `module_name` varchar(255) NOT NULL,
-                   `name` varchar(255) NOT NULL,
+                   `module_name` varchar(64) NOT NULL,
+                   `name` varchar(64) NOT NULL,
                    `value` text,
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`module_name`, `name`))
diff --git a/modules/comment/helpers/comment_installer.php b/modules/comment/helpers/comment_installer.php
index 71b047e5..b38b127c 100644
--- a/modules/comment/helpers/comment_installer.php
+++ b/modules/comment/helpers/comment_installer.php
@@ -24,20 +24,20 @@ class comment_installer {
 
     if ($version == 0) {
       $db->query("CREATE TABLE IF NOT EXISTS `comments` (
-          `id` int(9) NOT NULL auto_increment,
-          `author` varchar(255) default NULL,
-          `email` varchar(255) default NULL,
-          `text` text,
-          `created` int(9) NOT NULL,
-          `item_id` int(9) NOT NULL,
-          `url` varchar(255) default NULL,
-          `published` tinyint(1) default 1,
-          `ip_addr` char(15) default NULL,
-          `user_agent` varchar(255) default NULL,
-          `spam_signature` varchar(255) default NULL,
-          `spam_type` char(15) default NULL,
-        PRIMARY KEY (`id`))
-        ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                   `id` int(9) NOT NULL auto_increment,
+                   `author` varchar(128) default NULL,
+                   `email` varchar(128) default NULL,
+                   `text` text,
+                   `created` int(9) NOT NULL,
+                   `item_id` int(9) NOT NULL,
+                   `url` varchar(255) default NULL,
+                   `published` boolean default 1,
+                   `ip_addr` char(15) default NULL,
+                   `user_agent` varchar(255) default NULL,
+                   `spam_signature` varchar(255) default NULL,
+                   `spam_type` char(15) default NULL,
+                 PRIMARY KEY (`id`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
       module::set_version("comment", 1);
     }
diff --git a/modules/tag/helpers/tag_installer.php b/modules/tag/helpers/tag_installer.php
index 5734b243..2e0b9085 100644
--- a/modules/tag/helpers/tag_installer.php
+++ b/modules/tag/helpers/tag_installer.php
@@ -23,21 +23,21 @@ class tag_installer {
     $version = module::get_version("tag");
     if ($version == 0) {
       $db->query("CREATE TABLE IF NOT EXISTS `tags` (
-          `id` int(9) NOT NULL auto_increment,
-          `name` varchar(255) NOT NULL,
-          `count` int(10) unsigned NOT NULL DEFAULT 0,
-          PRIMARY KEY (`id`),
-          UNIQUE KEY(`name`))
-        ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                   `id` int(9) NOT NULL auto_increment,
+                   `name` varchar(64) NOT NULL,
+                   `count` int(10) unsigned NOT NULL DEFAULT 0,
+                   PRIMARY KEY (`id`),
+                   UNIQUE KEY(`name`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
       $db->query("CREATE TABLE IF NOT EXISTS `items_tags` (
-          `id` int(9) NOT NULL auto_increment,
-          `item_id` int(9) NOT NULL,
-          `tag_id` int(9) NOT NULL,
-          PRIMARY KEY (`id`),
-          KEY(`tag_id`, `id`),
-          KEY(`item_id`, `id`))
-        ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                   `id` int(9) NOT NULL auto_increment,
+                   `item_id` int(9) NOT NULL,
+                   `tag_id` int(9) NOT NULL,
+                   PRIMARY KEY (`id`),
+                   KEY(`tag_id`, `id`),
+                   KEY(`item_id`, `id`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
       module::set_version("tag", 1);
     }
   }
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index e19abc11..8a583211 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -24,33 +24,33 @@ class user_installer {
 
     if ($version == 0) {
       $db->query("CREATE TABLE IF NOT EXISTS `users` (
-          `id` int(9) NOT NULL auto_increment,
-          `name` varchar(32) NOT NULL,
-          `full_name` varchar(255) NOT NULL,
-          `password` varchar(128) NOT NULL,
-          `login_count` int(10) unsigned NOT NULL DEFAULT 0,
-          `last_login` int(10) unsigned NOT NULL DEFAULT 0,
-          `email` varchar(255) default NULL,
-          `admin` BOOLEAN default 0,
-          `guest` BOOLEAN default 0,
-          PRIMARY KEY (`id`),
-          UNIQUE KEY(`name`))
-        ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                   `id` int(9) NOT NULL auto_increment,
+                   `name` varchar(32) NOT NULL,
+                   `full_name` varchar(255) NOT NULL,
+                   `password` varchar(64) NOT NULL,
+                   `login_count` int(10) unsigned NOT NULL DEFAULT 0,
+                   `last_login` int(10) unsigned NOT NULL DEFAULT 0,
+                   `email` varchar(64) default NULL,
+                   `admin` BOOLEAN default 0,
+                   `guest` BOOLEAN default 0,
+                   PRIMARY KEY (`id`),
+                   UNIQUE KEY(`name`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
       $db->query("CREATE TABLE IF NOT EXISTS `groups` (
-          `id` int(9) NOT NULL auto_increment,
-          `name` char(255) default NULL,
-          `special` BOOLEAN default 0,
-          PRIMARY KEY (`id`),
-          UNIQUE KEY(`name`))
-        ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                   `id` int(9) NOT NULL auto_increment,
+                   `name` char(64) default NULL,
+                   `special` BOOLEAN default 0,
+                   PRIMARY KEY (`id`),
+                   UNIQUE KEY(`name`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
       $db->query("CREATE TABLE IF NOT EXISTS `groups_users` (
-          `group_id` int(9) NOT NULL,
-          `user_id` int(9) NOT NULL,
-          PRIMARY KEY (`group_id`, `user_id`),
-          UNIQUE KEY(`user_id`, `group_id`))
-        ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                   `group_id` int(9) NOT NULL,
+                   `user_id` int(9) NOT NULL,
+                   PRIMARY KEY (`group_id`, `user_id`),
+                   UNIQUE KEY(`user_id`, `group_id`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
       $everybody = group::create("Everybody");
       $everybody->special = true;
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index 01dfa40a..16ca8a9a 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -23,16 +23,16 @@ class watermark_installer {
     $version = module::get_version("watermark");
     if ($version == 0) {
       $db->query("CREATE TABLE IF NOT EXISTS `watermarks` (
-          `id` int(9) NOT NULL auto_increment,
-          `name` varchar(32) NOT NULL,
-          `width` int(9) NOT NULL,
-          `height` int(9) NOT NULL,
-          `active` boolean default 0,
-          `position` boolean default 0,
-          `mime_type` varchar(64) default NULL,
-          PRIMARY KEY (`id`),
-          UNIQUE KEY(`name`))
-        ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                   `id` int(9) NOT NULL auto_increment,
+                   `name` varchar(32) NOT NULL,
+                   `width` int(9) NOT NULL,
+                   `height` int(9) NOT NULL,
+                   `active` boolean default 0,
+                   `position` boolean default 0,
+                   `mime_type` varchar(64) default NULL,
+                   PRIMARY KEY (`id`),
+                   UNIQUE KEY(`name`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
       @mkdir(VARPATH . "modules/watermark");
       module::set_version("watermark", 1);