No OneTemporary
Actions

Size

28 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql
	index 9139509a5..d43676ff9 100644
	--- a/SQL/mssql.initial.sql
	+++ b/SQL/mssql.initial.sql
	@@ -1,376 +1,376 @@
	CREATE TABLE [dbo].[cache] (
	[user_id] [int] NOT NULL ,
	[cache_key] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[created] [datetime] NOT NULL ,
	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[cache_index] (
	[user_id] [int] NOT NULL ,
	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[changed] [datetime] NOT NULL ,
	[valid] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[cache_thread] (
	[user_id] [int] NOT NULL ,
	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[changed] [datetime] NOT NULL ,
	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[cache_messages] (
	[user_id] [int] NOT NULL ,
	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[uid] [int] NOT NULL ,
	[changed] [datetime] NOT NULL ,
	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL ,
	[flags] [int] NOT NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[contacts] (
	[contact_id] [int] IDENTITY (1, 1) NOT NULL ,
	[user_id] [int] NOT NULL ,
	[changed] [datetime] NOT NULL ,
	[del] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[email] [varchar] (8000) COLLATE Latin1_General_CI_AI NOT NULL ,
	[firstname] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[surname] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[vcard] [text] COLLATE Latin1_General_CI_AI NULL ,
	[words] [text] COLLATE Latin1_General_CI_AI NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[contactgroups] (
	[contactgroup_id] [int] IDENTITY (1, 1) NOT NULL ,
	[user_id] [int] NOT NULL ,
	[changed] [datetime] NOT NULL ,
	[del] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL
	) ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[contactgroupmembers] (
	[contactgroup_id] [int] NOT NULL ,
	[contact_id] [int] NOT NULL ,
	[created] [datetime] NOT NULL
	) ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[identities] (
	[identity_id] [int] IDENTITY (1, 1) NOT NULL ,
	[user_id] [int] NOT NULL ,
	[changed] [datetime] NOT NULL ,
	[del] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
	[standard] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[organization] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[email] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[reply-to] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[bcc] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[signature] [text] COLLATE Latin1_General_CI_AI NULL,
	[html_signature] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[session] (
	[sess_id] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[created] [datetime] NOT NULL ,
	[changed] [datetime] NULL ,
	[ip] [varchar] (40) COLLATE Latin1_General_CI_AI NOT NULL ,
	[vars] [text] COLLATE Latin1_General_CI_AI NOT NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[users] (
	[user_id] [int] IDENTITY (1, 1) NOT NULL ,
	[username] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[mail_host] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[created] [datetime] NOT NULL ,
	[last_login] [datetime] NULL ,
	[language] [varchar] (5) COLLATE Latin1_General_CI_AI NULL ,
	[preferences] [text] COLLATE Latin1_General_CI_AI NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[dictionary] (
	[user_id] [int] ,
	[language] [varchar] (5) COLLATE Latin1_General_CI_AI NOT NULL ,
	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[searches] (
	[search_id] [int] IDENTITY (1, 1) NOT NULL ,
	[user_id] [int] NOT NULL ,
	[type] [tinyint] NOT NULL ,
	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	CREATE TABLE [dbo].[system] (
	[name] [varchar] (64) COLLATE Latin1_General_CI_AI NOT NULL ,
	[value] [text] COLLATE Latin1_General_CI_AI NOT NULL
	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[cache_index] WITH NOCHECK ADD
	PRIMARY KEY CLUSTERED
	(
	[user_id],[mailbox]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[cache_thread] WITH NOCHECK ADD
	PRIMARY KEY CLUSTERED
	(
	[user_id],[mailbox]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[cache_messages] WITH NOCHECK ADD
	PRIMARY KEY CLUSTERED
	(
	[user_id],[mailbox],[uid]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[contacts] WITH NOCHECK ADD
	CONSTRAINT [PK_contacts_contact_id] PRIMARY KEY CLUSTERED
	(
	[contact_id]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[contactgroups] WITH NOCHECK ADD
	CONSTRAINT [PK_contactgroups_contactgroup_id] PRIMARY KEY CLUSTERED
	(
	[contactgroup_id]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[contactgroupmembers] WITH NOCHECK ADD
	CONSTRAINT [PK_contactgroupmembers_id] PRIMARY KEY CLUSTERED
	(
	[contactgroup_id], [contact_id]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[identities] WITH NOCHECK ADD
	PRIMARY KEY CLUSTERED
	(
	[identity_id]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[session] WITH NOCHECK ADD
	CONSTRAINT [PK_session_sess_id] PRIMARY KEY CLUSTERED
	(
	[sess_id]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[users] WITH NOCHECK ADD
	CONSTRAINT [PK_users_user_id] PRIMARY KEY CLUSTERED
	(
	[user_id]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[searches] WITH NOCHECK ADD
	CONSTRAINT [PK_searches_search_id] PRIMARY KEY CLUSTERED
	(
	[search_id]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[system] WITH NOCHECK ADD
	CONSTRAINT [PK_system_name] PRIMARY KEY CLUSTERED
	(
	[name]
	) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[cache] ADD
	CONSTRAINT [DF_cache_user_id] DEFAULT ('0') FOR [user_id],
	CONSTRAINT [DF_cache_cache_key] DEFAULT ('') FOR [cache_key],
	CONSTRAINT [DF_cache_created] DEFAULT (getdate()) FOR [created]
	GO

	CREATE INDEX [IX_cache_user_id] ON [dbo].[cache]([user_id]) ON [PRIMARY]
	GO

	CREATE INDEX [IX_cache_cache_key] ON [dbo].[cache]([cache_key]) ON [PRIMARY]
	GO

	CREATE INDEX [IX_cache_created] ON [dbo].[cache]([created]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[cache_index] ADD
	CONSTRAINT [DF_cache_index_changed] DEFAULT (getdate()) FOR [changed],
	CONSTRAINT [DF_cache_index_valid] DEFAULT ('0') FOR [valid]
	GO

	CREATE INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[cache_thread] ADD
	CONSTRAINT [DF_cache_thread_changed] DEFAULT (getdate()) FOR [changed]
	GO

	CREATE INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[cache_messages] ADD
	CONSTRAINT [DF_cache_messages_changed] DEFAULT (getdate()) FOR [changed],
	CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]
	GO

	CREATE INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[contacts] ADD
	CONSTRAINT [DF_contacts_user_id] DEFAULT (0) FOR [user_id],
	CONSTRAINT [DF_contacts_changed] DEFAULT (getdate()) FOR [changed],
	CONSTRAINT [DF_contacts_del] DEFAULT ('0') FOR [del],
	CONSTRAINT [DF_contacts_name] DEFAULT ('') FOR [name],
	CONSTRAINT [DF_contacts_email] DEFAULT ('') FOR [email],
	CONSTRAINT [DF_contacts_firstname] DEFAULT ('') FOR [firstname],
	CONSTRAINT [DF_contacts_surname] DEFAULT ('') FOR [surname],
	CONSTRAINT [CK_contacts_del] CHECK ([del] = '1' or [del] = '0')
	GO

	CREATE INDEX [IX_contacts_user_id] ON [dbo].[contacts]([user_id]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[contactgroups] ADD
	CONSTRAINT [DF_contactgroups_user_id] DEFAULT (0) FOR [user_id],
	CONSTRAINT [DF_contactgroups_changed] DEFAULT (getdate()) FOR [changed],
	CONSTRAINT [DF_contactgroups_del] DEFAULT ('0') FOR [del],
	CONSTRAINT [DF_contactgroups_name] DEFAULT ('') FOR [name],
	CONSTRAINT [CK_contactgroups_del] CHECK ([del] = '1' or [del] = '0')
	GO

	CREATE INDEX [IX_contactgroups_user_id] ON [dbo].[contacts]([user_id]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[contactgroupmembers] ADD
	CONSTRAINT [DF_contactgroupmembers_contactgroup_id] DEFAULT (0) FOR [contactgroup_id],
	CONSTRAINT [DF_contactgroupmembers_contact_id] DEFAULT (0) FOR [contact_id],
	CONSTRAINT [DF_contactgroupmembers_created] DEFAULT (getdate()) FOR [created]
	GO

	CREATE INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[identities] ADD
	CONSTRAINT [DF_identities_user] DEFAULT ('0') FOR [user_id],
	CONSTRAINT [DF_identities_del] DEFAULT ('0') FOR [del],
	CONSTRAINT [DF_identities_standard] DEFAULT ('0') FOR [standard],
	CONSTRAINT [DF_identities_name] DEFAULT ('') FOR [name],
	CONSTRAINT [DF_identities_organization] DEFAULT ('') FOR [organization],
	CONSTRAINT [DF_identities_email] DEFAULT ('') FOR [email],
	CONSTRAINT [DF_identities_reply] DEFAULT ('') FOR [reply-to],
	CONSTRAINT [DF_identities_bcc] DEFAULT ('') FOR [bcc],
	CONSTRAINT [DF_identities_html_signature] DEFAULT ('0') FOR [html_signature],
	CHECK ([standard] = '1' or [standard] = '0'),
	CHECK ([del] = '1' or [del] = '0')
	GO

	CREATE INDEX [IX_identities_user_id] ON [dbo].[identities]([user_id]) ON [PRIMARY]
	GO
	CREATE INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[session] ADD
	CONSTRAINT [DF_session_sess_id] DEFAULT ('') FOR [sess_id],
	CONSTRAINT [DF_session_created] DEFAULT (getdate()) FOR [created],
	CONSTRAINT [DF_session_ip] DEFAULT ('') FOR [ip]
	GO

	CREATE INDEX [IX_session_changed] ON [dbo].[session]([changed]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[users] ADD
	CONSTRAINT [DF_users_username] DEFAULT ('') FOR [username],
	CONSTRAINT [DF_users_mail_host] DEFAULT ('') FOR [mail_host],
	CONSTRAINT [DF_users_created] DEFAULT (getdate()) FOR [created]
	GO

	CREATE UNIQUE INDEX [IX_users_username] ON [dbo].[users]([username],[mail_host]) ON [PRIMARY]
	GO

	CREATE UNIQUE INDEX [IX_dictionary_user_language] ON [dbo].[dictionary]([user_id],[language]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[searches] ADD
	CONSTRAINT [DF_searches_user] DEFAULT (0) FOR [user_id],
	CONSTRAINT [DF_searches_type] DEFAULT (0) FOR [type]
	GO

	CREATE UNIQUE INDEX [IX_searches_user_type_name] ON [dbo].[searches]([user_id],[type],[name]) ON [PRIMARY]
	GO

	ALTER TABLE [dbo].[identities] ADD CONSTRAINT [FK_identities_user_id]
	FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
	ON DELETE CASCADE ON UPDATE CASCADE
	GO

	ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [FK_contacts_user_id]
	FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
	ON DELETE CASCADE ON UPDATE CASCADE
	GO

	ALTER TABLE [dbo].[contactgroups] ADD CONSTRAINT [FK_contactgroups_user_id]
	FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
	ON DELETE CASCADE ON UPDATE CASCADE
	GO

	ALTER TABLE [dbo].[cache] ADD CONSTRAINT [FK_cache_user_id]
	FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
	ON DELETE CASCADE ON UPDATE CASCADE
	GO

	ALTER TABLE [dbo].[cache_index] ADD CONSTRAINT [FK_cache_index_user_id]
	FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
	ON DELETE CASCADE ON UPDATE CASCADE
	GO

	ALTER TABLE [dbo].[cache_thread] ADD CONSTRAINT [FK_cache_thread_user_id]
	FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
	ON DELETE CASCADE ON UPDATE CASCADE
	GO

	ALTER TABLE [dbo].[cache_messages] ADD CONSTRAINT [FK_cache_messages_user_id]
	FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
	ON DELETE CASCADE ON UPDATE CASCADE
	GO

	ALTER TABLE [dbo].[contactgroupmembers] ADD CONSTRAINT [FK_contactgroupmembers_contactgroup_id]
	FOREIGN KEY ([contactgroup_id]) REFERENCES [dbo].[contactgroups] ([contactgroup_id])
	ON DELETE CASCADE ON UPDATE CASCADE
	GO

	ALTER TABLE [dbo].[searches] ADD CONSTRAINT [FK_searches_user_id]
	FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
	ON DELETE CASCADE ON UPDATE CASCADE
	GO

	-- Use trigger instead of foreign key (#1487112)
	-- "Introducing FOREIGN KEY constraint ... may cause cycles or multiple cascade paths."
	CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]
	AFTER DELETE AS
	DELETE FROM [dbo].[contactgroupmembers]
	WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)
	GO

	-INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013011700')
	+INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013042700')
	GO

	\ No newline at end of file
	diff --git a/SQL/mssql/2013042700.sql b/SQL/mssql/2013042700.sql
	new file mode 100644
	index 000000000..fe6741a02
	--- /dev/null
	+++ b/SQL/mssql/2013042700.sql
	@@ -0,0 +1 @@
	+-- empty
	\ No newline at end of file
	diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
	index cb750c5ea..5a86dd8f8 100644
	--- a/SQL/mysql.initial.sql
	+++ b/SQL/mysql.initial.sql
	@@ -1,199 +1,199 @@
	-- Roundcube Webmail initial database structure


	/!40014 SET FOREIGN_KEY_CHECKS=0 /;

	-- Table structure for table `session`

	CREATE TABLE `session` (
	`sess_id` varchar(128) NOT NULL,
	`created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`ip` varchar(40) NOT NULL,
	`vars` mediumtext NOT NULL,
	PRIMARY KEY(`sess_id`),
	INDEX `changed_index` (`changed`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;


	-- Table structure for table `users`

	CREATE TABLE `users` (
	`user_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
	`username` varchar(128) BINARY NOT NULL,
	`mail_host` varchar(128) NOT NULL,
	`created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`last_login` datetime DEFAULT NULL,
	`language` varchar(5),
	`preferences` text,
	PRIMARY KEY(`user_id`),
	UNIQUE `username` (`username`, `mail_host`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;


	-- Table structure for table `cache`

	CREATE TABLE `cache` (
	`user_id` int(10) UNSIGNED NOT NULL,
	`cache_key` varchar(128) /!40101 CHARACTER SET ascii COLLATE ascii_general_ci / NOT NULL ,
	`created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`data` longtext NOT NULL,
	CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
	REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	INDEX `created_index` (`created`),
	INDEX `user_cache_index` (`user_id`,`cache_key`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;


	-- Table structure for table `cache_index`

	CREATE TABLE `cache_index` (
	`user_id` int(10) UNSIGNED NOT NULL,
	`mailbox` varchar(255) BINARY NOT NULL,
	`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`valid` tinyint(1) NOT NULL DEFAULT '0',
	`data` longtext NOT NULL,
	CONSTRAINT `user_id_fk_cache_index` FOREIGN KEY (`user_id`)
	REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	INDEX `changed_index` (`changed`),
	PRIMARY KEY (`user_id`, `mailbox`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;


	-- Table structure for table `cache_thread`

	CREATE TABLE `cache_thread` (
	`user_id` int(10) UNSIGNED NOT NULL,
	`mailbox` varchar(255) BINARY NOT NULL,
	`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`data` longtext NOT NULL,
	CONSTRAINT `user_id_fk_cache_thread` FOREIGN KEY (`user_id`)
	REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	INDEX `changed_index` (`changed`),
	PRIMARY KEY (`user_id`, `mailbox`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;


	-- Table structure for table `cache_messages`

	CREATE TABLE `cache_messages` (
	`user_id` int(10) UNSIGNED NOT NULL,
	`mailbox` varchar(255) BINARY NOT NULL,
	`uid` int(11) UNSIGNED NOT NULL DEFAULT '0',
	`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`data` longtext NOT NULL,
	`flags` int(11) NOT NULL DEFAULT '0',
	CONSTRAINT `user_id_fk_cache_messages` FOREIGN KEY (`user_id`)
	REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	INDEX `changed_index` (`changed`),
	PRIMARY KEY (`user_id`, `mailbox`, `uid`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;


	-- Table structure for table `contacts`

	CREATE TABLE `contacts` (
	`contact_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
	`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`del` tinyint(1) NOT NULL DEFAULT '0',
	`name` varchar(128) NOT NULL DEFAULT '',
	`email` text NOT NULL,
	`firstname` varchar(128) NOT NULL DEFAULT '',
	`surname` varchar(128) NOT NULL DEFAULT '',
	`vcard` longtext NULL,
	`words` text NULL,
	`user_id` int(10) UNSIGNED NOT NULL,
	PRIMARY KEY(`contact_id`),
	CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
	REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	INDEX `user_contacts_index` (`user_id`,`del`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;

	-- Table structure for table `contactgroups`

	CREATE TABLE `contactgroups` (
	`contactgroup_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
	`user_id` int(10) UNSIGNED NOT NULL,
	`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`del` tinyint(1) NOT NULL DEFAULT '0',
	`name` varchar(128) NOT NULL DEFAULT '',
	PRIMARY KEY(`contactgroup_id`),
	CONSTRAINT `user_id_fk_contactgroups` FOREIGN KEY (`user_id`)
	REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	INDEX `contactgroups_user_index` (`user_id`,`del`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;

	CREATE TABLE `contactgroupmembers` (
	`contactgroup_id` int(10) UNSIGNED NOT NULL,
	`contact_id` int(10) UNSIGNED NOT NULL,
	`created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	PRIMARY KEY (`contactgroup_id`, `contact_id`),
	CONSTRAINT `contactgroup_id_fk_contactgroups` FOREIGN KEY (`contactgroup_id`)
	REFERENCES `contactgroups`(`contactgroup_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	CONSTRAINT `contact_id_fk_contacts` FOREIGN KEY (`contact_id`)
	REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	INDEX `contactgroupmembers_contact_index` (`contact_id`)
	) /!40000 ENGINE=INNODB /;


	-- Table structure for table `identities`

	CREATE TABLE `identities` (
	`identity_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
	`user_id` int(10) UNSIGNED NOT NULL,
	`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
	`del` tinyint(1) NOT NULL DEFAULT '0',
	`standard` tinyint(1) NOT NULL DEFAULT '0',
	`name` varchar(128) NOT NULL,
	`organization` 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,
	`html_signature` tinyint(1) NOT NULL DEFAULT '0',
	PRIMARY KEY(`identity_id`),
	CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
	REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	INDEX `user_identities_index` (`user_id`, `del`),
	INDEX `email_identities_index` (`email`, `del`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;


	-- Table structure for table `dictionary`

	CREATE TABLE `dictionary` (
	`user_id` int(10) UNSIGNED DEFAULT NULL,
	`language` varchar(5) NOT NULL,
	`data` longtext NOT NULL,
	CONSTRAINT `user_id_fk_dictionary` FOREIGN KEY (`user_id`)
	REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	UNIQUE `uniqueness` (`user_id`, `language`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;


	-- Table structure for table `searches`

	CREATE TABLE `searches` (
	`search_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
	`user_id` int(10) UNSIGNED NOT NULL,
	`type` int(3) NOT NULL DEFAULT '0',
	`name` varchar(128) NOT NULL,
	`data` text,
	PRIMARY KEY(`search_id`),
	CONSTRAINT `user_id_fk_searches` FOREIGN KEY (`user_id`)
	REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
	UNIQUE `uniqueness` (`user_id`, `type`, `name`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;


	-- Table structure for table `system`

	CREATE TABLE `system` (
	`name` varchar(64) NOT NULL,
	`value` mediumtext,
	PRIMARY KEY(`name`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;

	/!40014 SET FOREIGN_KEY_CHECKS=1 /;

	-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700');
	+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013042700');
	diff --git a/SQL/mysql/2013042700.sql b/SQL/mysql/2013042700.sql
	new file mode 100644
	index 000000000..fe6741a02
	--- /dev/null
	+++ b/SQL/mysql/2013042700.sql
	@@ -0,0 +1 @@
	+-- empty
	\ No newline at end of file
	diff --git a/SQL/postgres/2013042700.sql b/SQL/postgres/2013042700.sql
	new file mode 100644
	index 000000000..bbd567515
	--- /dev/null
	+++ b/SQL/postgres/2013042700.sql
	@@ -0,0 +1,14 @@
	+ALTER SEQUENCE user_ids RENAME TO users_seq;
	+ALTER TABLE users ALTER COLUMN user_id SET DEFAULT nextval('users_seq'::text);
	+
	+ALTER SEQUENCE identity_ids RENAME TO identities_seq;
	+ALTER TABLE identities ALTER COLUMN identity_id SET DEFAULT nextval('identities_seq'::text);
	+
	+ALTER SEQUENCE contact_ids RENAME TO contacts_seq;
	+ALTER TABLE contacts ALTER COLUMN contact_id SET DEFAULT nextval('contacts_seq'::text);
	+
	+ALTER SEQUENCE contactgroups_ids RENAME TO contactgroups_seq;
	+ALTER TABLE contactgroups ALTER COLUMN contactgroup_id SET DEFAULT nextval('contactgroups_seq'::text);
	+
	+ALTER SEQUENCE search_ids RENAME TO searches_seq;
	+ALTER TABLE searches ALTER COLUMN search_id SET DEFAULT nextval('searches_seq'::text);
	diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
	index 83874ce7c..d9bafb7e0 100644
	--- a/SQL/sqlite.initial.sql
	+++ b/SQL/sqlite.initial.sql
	@@ -1,212 +1,212 @@
	-- Roundcube Webmail initial database structure

	--
	-- Table structure for table cache
	--

	CREATE TABLE cache (
	user_id integer NOT NULL default 0,
	cache_key varchar(128) NOT NULL default '',
	created datetime NOT NULL default '0000-00-00 00:00:00',
	data text NOT NULL
	);

	CREATE INDEX ix_cache_user_cache_key ON cache(user_id, cache_key);
	CREATE INDEX ix_cache_created ON cache(created);


	-- --------------------------------------------------------

	--
	-- Table structure for table contacts and related
	--

	CREATE TABLE contacts (
	contact_id integer NOT NULL PRIMARY KEY,
	user_id integer NOT NULL,
	changed datetime NOT NULL default '0000-00-00 00:00:00',
	del tinyint NOT NULL default '0',
	name varchar(128) NOT NULL default '',
	email text NOT NULL default '',
	firstname varchar(128) NOT NULL default '',
	surname varchar(128) NOT NULL default '',
	vcard text NOT NULL default '',
	words text NOT NULL default ''
	);

	CREATE INDEX ix_contacts_user_id ON contacts(user_id, del);


	CREATE TABLE contactgroups (
	contactgroup_id integer NOT NULL PRIMARY KEY,
	user_id integer NOT NULL default '0',
	changed datetime NOT NULL default '0000-00-00 00:00:00',
	del tinyint NOT NULL default '0',
	name varchar(128) NOT NULL default ''
	);

	CREATE INDEX ix_contactgroups_user_id ON contactgroups(user_id, del);


	CREATE TABLE contactgroupmembers (
	contactgroup_id integer NOT NULL,
	contact_id integer NOT NULL default '0',
	created datetime NOT NULL default '0000-00-00 00:00:00',
	PRIMARY KEY (contactgroup_id, contact_id)
	);

	CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);


	-- --------------------------------------------------------

	--
	-- Table structure for table identities
	--

	CREATE TABLE identities (
	identity_id integer NOT NULL PRIMARY KEY,
	user_id integer NOT NULL default '0',
	changed datetime NOT NULL default '0000-00-00 00:00:00',
	del tinyint NOT NULL default '0',
	standard tinyint NOT NULL default '0',
	name varchar(128) NOT NULL default '',
	organization varchar(128) default '',
	email varchar(128) NOT NULL default '',
	"reply-to" varchar(128) NOT NULL default '',
	bcc varchar(128) NOT NULL default '',
	signature text NOT NULL default '',
	html_signature tinyint NOT NULL default '0'
	);

	CREATE INDEX ix_identities_user_id ON identities(user_id, del);
	CREATE INDEX ix_identities_email ON identities(email, del);


	-- --------------------------------------------------------

	--
	-- Table structure for table users
	--

	CREATE TABLE users (
	user_id integer NOT NULL PRIMARY KEY,
	username varchar(128) NOT NULL default '',
	mail_host varchar(128) NOT NULL default '',
	created datetime NOT NULL default '0000-00-00 00:00:00',
	last_login datetime DEFAULT NULL,
	language varchar(5),
	preferences text NOT NULL default ''
	);

	CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);

	-- --------------------------------------------------------

	--
	-- Table structure for table session
	--

	CREATE TABLE session (
	sess_id varchar(128) NOT NULL PRIMARY KEY,
	created datetime NOT NULL default '0000-00-00 00:00:00',
	changed datetime NOT NULL default '0000-00-00 00:00:00',
	ip varchar(40) NOT NULL default '',
	vars text NOT NULL
	);

	CREATE INDEX ix_session_changed ON session (changed);

	-- --------------------------------------------------------

	--
	-- Table structure for table dictionary
	--

	CREATE TABLE dictionary (
	user_id integer DEFAULT NULL,
	"language" varchar(5) NOT NULL,
	data text NOT NULL
	);

	CREATE UNIQUE INDEX ix_dictionary_user_language ON dictionary (user_id, "language");

	-- --------------------------------------------------------

	--
	-- Table structure for table searches
	--

	CREATE TABLE searches (
	search_id integer NOT NULL PRIMARY KEY,
	user_id integer NOT NULL DEFAULT '0',
	"type" smallint NOT NULL DEFAULT '0',
	name varchar(128) NOT NULL,
	data text NOT NULL
	);

	CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);

	-- --------------------------------------------------------

	--
	-- Table structure for table cache_index
	--

	CREATE TABLE cache_index (
	user_id integer NOT NULL,
	mailbox varchar(255) NOT NULL,
	changed datetime NOT NULL default '0000-00-00 00:00:00',
	valid smallint NOT NULL DEFAULT '0',
	data text NOT NULL,
	PRIMARY KEY (user_id, mailbox)
	);

	CREATE INDEX ix_cache_index_changed ON cache_index (changed);

	-- --------------------------------------------------------

	--
	-- Table structure for table cache_thread
	--

	CREATE TABLE cache_thread (
	user_id integer NOT NULL,
	mailbox varchar(255) NOT NULL,
	changed datetime NOT NULL default '0000-00-00 00:00:00',
	data text NOT NULL,
	PRIMARY KEY (user_id, mailbox)
	);

	CREATE INDEX ix_cache_thread_changed ON cache_thread (changed);

	-- --------------------------------------------------------

	--
	-- Table structure for table cache_messages
	--

	CREATE TABLE cache_messages (
	user_id integer NOT NULL,
	mailbox varchar(255) NOT NULL,
	uid integer NOT NULL,
	changed datetime NOT NULL default '0000-00-00 00:00:00',
	data text NOT NULL,
	flags integer NOT NULL DEFAULT '0',
	PRIMARY KEY (user_id, mailbox, uid)
	);

	CREATE INDEX ix_cache_messages_changed ON cache_messages (changed);

	-- --------------------------------------------------------

	--
	-- Table structure for table system
	--

	CREATE TABLE system (
	name varchar(64) NOT NULL PRIMARY KEY,
	value text NOT NULL
	);

	-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700');
	+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013042700');
	diff --git a/SQL/sqlite/2013042700.sql b/SQL/sqlite/2013042700.sql
	new file mode 100644
	index 000000000..fe6741a02
	--- /dev/null
	+++ b/SQL/sqlite/2013042700.sql
	@@ -0,0 +1 @@
	+-- empty
	\ No newline at end of file

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 8:12 AM (1 d, 15 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166365
Default Alt Text: (28 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions