From debdda011717e63945a0f6a9db6ab77b30a47079 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 25 Nov 2008 05:17:57 -0500
Subject: [PATCH] #1485420: remove default (and not null) for users.language column in DDL

---
 SQL/mysql.initial.sql |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 4bba84c..5b2bb8a 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -1,5 +1,5 @@
 -- RoundCube Webmail initial database structure
--- Version 0.1-rc1
+-- Version 0.1
 -- 
 
 -- --------------------------------------------------------
@@ -11,14 +11,12 @@
 CREATE TABLE `cache` (
   `cache_id` int(10) unsigned NOT NULL auto_increment,
   `user_id` int(10) unsigned NOT NULL default '0',
-  `session_id` varchar(40) default NULL,
   `cache_key` varchar(128) NOT NULL default '',
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `data` longtext NOT NULL,
   PRIMARY KEY  (`cache_id`),
-  KEY `user_id` (`user_id`),
-  KEY `cache_key` (`cache_key`),
-  KEY `session_id` (`session_id`)
+  INDEX `created_index` (`created`),
+  INDEX `user_cache_index` (`user_id`,`cache_key`)
 );
 
 -- --------------------------------------------------------
@@ -52,12 +50,12 @@
   `user_id` int(10) unsigned NOT NULL default '0',
   `del` tinyint(1) NOT NULL default '0',
   `standard` tinyint(1) NOT NULL default '0',
-  `name` varchar(128) NOT NULL default '',
+  `name` varchar(128) NOT NULL,
   `organization` varchar(128) NOT NULL default '',
-  `email` varchar(128) NOT NULL default '',
+  `email` varchar(128) NOT NULL,
   `reply-to` varchar(128) NOT NULL default '',
   `bcc` varchar(128) NOT NULL default '',
-  `signature` text NOT NULL,
+  `signature` text,
   `html_signature` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`identity_id`),
   KEY `user_id` (`user_id`)
@@ -75,7 +73,8 @@
   `changed` datetime NOT NULL default '0000-00-00 00:00:00',
   `ip` VARCHAR(40) NOT NULL default '',
   `vars` text NOT NULL,
-  PRIMARY KEY  (`sess_id`)
+  PRIMARY KEY  (`sess_id`),
+  INDEX `changed_index` (`changed`) 
 );
 
 -- --------------------------------------------------------
@@ -91,9 +90,11 @@
   `alias` varchar(128) NOT NULL default '',
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `last_login` datetime NOT NULL default '0000-00-00 00:00:00',
-  `language` varchar(5) NOT NULL default 'en',
-  `preferences` text NOT NULL default '',
-  PRIMARY KEY  (`user_id`)
+  `language` varchar(5),
+  `preferences` text,
+  PRIMARY KEY  (`user_id`),
+  INDEX `username_index` (`username`),
+  INDEX `alias_index` (`alias`)
 );
 
 -- --------------------------------------------------------
@@ -118,10 +119,8 @@
   `size` int(11) unsigned NOT NULL default '0',
   `headers` text NOT NULL,
   `structure` text,
-  PRIMARY KEY  (`message_id`),
-  KEY `user_id` (`user_id`),
-  KEY `idx` (`idx`),
-  KEY `uid` (`uid`),
+  PRIMARY KEY (`message_id`),
+  INDEX `created_index` (`created`),
   UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`)
 );
 

--
Gitblit v1.9.1