From 2bedfab77a33da76bb450bff20de76c4ecdf9898 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 29 Nov 2008 12:17:13 -0500
Subject: [PATCH] Add conditional comments to mysql initial script (#1485517); remove old mysql 4.0 init script
---
/dev/null | 127 ------------------------------------------
SQL/mysql5.initial.sql | 34 ++++++-----
2 files changed, 19 insertions(+), 142 deletions(-)
diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
deleted file mode 100644
index 5b2bb8a..0000000
--- a/SQL/mysql.initial.sql
+++ /dev/null
@@ -1,127 +0,0 @@
--- RoundCube Webmail initial database structure
--- Version 0.1
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `cache`
---
-
-CREATE TABLE `cache` (
- `cache_id` int(10) unsigned NOT NULL auto_increment,
- `user_id` int(10) unsigned NOT NULL default '0',
- `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`),
- INDEX `created_index` (`created`),
- INDEX `user_cache_index` (`user_id`,`cache_key`)
-);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `contacts`
---
-
-CREATE TABLE `contacts` (
- `contact_id` int(10) unsigned NOT NULL auto_increment,
- `user_id` int(10) unsigned NOT NULL default '0',
- `changed` datetime NOT NULL default '0000-00-00 00:00:00',
- `del` tinyint(1) NOT NULL default '0',
- `name` varchar(128) NOT NULL default '',
- `email` varchar(128) NOT NULL default '',
- `firstname` varchar(128) NOT NULL default '',
- `surname` varchar(128) NOT NULL default '',
- `vcard` text NOT NULL,
- PRIMARY KEY (`contact_id`),
- KEY `user_id` (`user_id`)
-);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `identities`
---
-
-CREATE TABLE `identities` (
- `identity_id` int(10) unsigned NOT NULL auto_increment,
- `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,
- `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`),
- KEY `user_id` (`user_id`)
-);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `session`
---
-
-CREATE TABLE `session` (
- `sess_id` varchar(40) NOT NULL default '',
- `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,
- PRIMARY KEY (`sess_id`),
- INDEX `changed_index` (`changed`)
-);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `users`
---
-
-CREATE TABLE `users` (
- `user_id` int(10) unsigned NOT NULL auto_increment,
- `username` varchar(128) NOT NULL default '',
- `mail_host` varchar(128) NOT NULL default '',
- `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),
- `preferences` text,
- PRIMARY KEY (`user_id`),
- INDEX `username_index` (`username`),
- INDEX `alias_index` (`alias`)
-);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `messages`
---
-
-CREATE TABLE `messages` (
- `message_id` int(11) unsigned NOT NULL auto_increment,
- `user_id` int(11) unsigned NOT NULL default '0',
- `del` tinyint(1) NOT NULL default '0',
- `cache_key` varchar(128) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `idx` int(11) unsigned NOT NULL default '0',
- `uid` int(11) unsigned NOT NULL default '0',
- `subject` varchar(255) NOT NULL default '',
- `from` varchar(255) NOT NULL default '',
- `to` varchar(255) NOT NULL default '',
- `cc` varchar(255) NOT NULL default '',
- `date` datetime NOT NULL default '0000-00-00 00:00:00',
- `size` int(11) unsigned NOT NULL default '0',
- `headers` text NOT NULL,
- `structure` text,
- PRIMARY KEY (`message_id`),
- INDEX `created_index` (`created`),
- UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`)
-);
-
-
diff --git a/SQL/mysql5.initial.sql b/SQL/mysql5.initial.sql
index 8c6b1e0..5a1bfd1 100644
--- a/SQL/mysql5.initial.sql
+++ b/SQL/mysql5.initial.sql
@@ -1,9 +1,9 @@
-- RoundCube Webmail initial database structure
--- Version 0.1
+-- Version 0.2
-- --------------------------------------------------------
-SET FOREIGN_KEY_CHECKS=0;
+/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
-- Table structure for table `session`
@@ -16,7 +16,7 @@
`vars` text NOT NULL,
PRIMARY KEY(`sess_id`),
INDEX `changed_index` (`changed`)
-) TYPE=INNODB CHARACTER SET utf8 COLLATE utf8_general_ci;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-- Table structure for table `users`
@@ -33,7 +33,7 @@
PRIMARY KEY(`user_id`),
INDEX `username_index` (`username`),
INDEX `alias_index` (`alias`)
-) TYPE=INNODB CHARACTER SET utf8 COLLATE utf8_general_ci;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-- Table structure for table `messages`
@@ -42,7 +42,7 @@
`message_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
`del` tinyint(1) NOT NULL DEFAULT '0',
- `cache_key` varchar(128) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
+ `cache_key` varchar(128) /*!40101 CHARACTER SET ascii COLLATE ascii_general_ci */ NOT NULL,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`idx` int(11) UNSIGNED NOT NULL DEFAULT '0',
`uid` int(11) UNSIGNED NOT NULL DEFAULT '0',
@@ -59,16 +59,17 @@
UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`),
CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`)
+ /*!40008
ON DELETE CASCADE
- ON UPDATE CASCADE
-) TYPE=INNODB CHARACTER SET utf8 COLLATE utf8_general_ci;
+ ON UPDATE CASCADE */
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-- Table structure for table `cache`
CREATE TABLE `cache` (
`cache_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
- `cache_key` varchar(128) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
+ `cache_key` varchar(128) /*!40101 CHARACTER SET ascii COLLATE ascii_general_ci */ NOT NULL ,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`data` longtext NOT NULL,
`user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
@@ -77,9 +78,10 @@
INDEX `user_cache_index` (`user_id`,`cache_key`),
CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`)
+ /*!40008
ON DELETE CASCADE
- ON UPDATE CASCADE
-) TYPE=INNODB CHARACTER SET utf8 COLLATE utf8_general_ci;
+ ON UPDATE CASCADE */
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-- Table structure for table `contacts`
@@ -97,9 +99,10 @@
PRIMARY KEY(`contact_id`),
CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`)
+ /*!40008
ON DELETE CASCADE
- ON UPDATE CASCADE
-) TYPE=INNODB CHARACTER SET utf8 COLLATE utf8_general_ci;
+ ON UPDATE CASCADE */
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-- Table structure for table `identities`
@@ -119,9 +122,10 @@
PRIMARY KEY(`identity_id`),
CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`)
+ /*!40008
ON DELETE CASCADE
- ON UPDATE CASCADE
-) TYPE=INNODB CHARACTER SET utf8 COLLATE utf8_general_ci;
+ ON UPDATE CASCADE */
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-SET FOREIGN_KEY_CHECKS=1;
+/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
--
Gitblit v1.9.1