From d7f3d796a240ed830346e74de46e108cc3fb4d3a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 19 May 2008 05:07:13 -0400
Subject: [PATCH] -Fixed Mysql DDL for default identities creation (#1485070)
---
CHANGELOG | 4 ++++
SQL/mysql5.initial.sql | 8 ++++----
SQL/mysql.update.sql | 10 ++++++++++
SQL/mysql.initial.sql | 6 +++---
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 45ca598..2af3551 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/05/19 (alec)
+----------
+- Fixed Mysql DDL for default identities creation (#1485070)
+
2008/05/16 (alec)
----------
- In Preferences added possibility to configure 'read_when_deleted',
diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 019675e..fadc072 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -50,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 NOT NULL default '',
`html_signature` tinyint(1) NOT NULL default '0',
PRIMARY KEY (`identity_id`),
KEY `user_id` (`user_id`)
diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index 103cb61..2a9603f 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -15,3 +15,13 @@
ALTER TABLE `users`
ADD INDEX `username_index` (`username`),
ADD INDEX `alias_index` (`alias`);
+
+-- Updates from version 0.1.1
+
+ALTER TABLE `identities`
+ MODIFY `signature` text NOT NULL DEFAULT '',
+ MODIFY `bcc` varchar(128) NOT NULL DEFAULT '',
+ MODIFY `reply-to` varchar(128) NOT NULL DEFAULT '',
+ MODIFY `organization` varchar(128) NOT NULL DEFAULT '',
+ MODIFY `name` varchar(128) NOT NULL,
+ MODIFY `email` varchar(128) NOT NULL;
diff --git a/SQL/mysql5.initial.sql b/SQL/mysql5.initial.sql
index 881344b..546eecd 100644
--- a/SQL/mysql5.initial.sql
+++ b/SQL/mysql5.initial.sql
@@ -107,11 +107,11 @@
`del` tinyint(1) NOT NULL DEFAULT '0',
`standard` tinyint(1) NOT NULL DEFAULT '0',
`name` varchar(128) NOT NULL,
- `organization` varchar(128) NOT NULL,
+ `organization` varchar(128) NOT NULL DEFAULT '',
`email` varchar(128) NOT NULL,
- `reply-to` varchar(128) NOT NULL,
- `bcc` varchar(128) NOT NULL,
- `signature` text NOT NULL,
+ `reply-to` varchar(128) NOT NULL DEFAULT '',
+ `bcc` varchar(128) NOT NULL DEFAULT '',
+ `signature` text NOT NULL DEFAULT '',
`html_signature` tinyint(1) NOT NULL DEFAULT '0',
`user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY(`identity_id`),
--
Gitblit v1.9.1