Permalink
Browse files

- re-fix (#1486474) + require MySQL 4.0.8 + add index/update in ident…

…ities table
  • Loading branch information...
1 parent 1163db9 commit 94fe9ca1a87b20ddeee55024986e95ca72097af6 @alecpl alecpl committed Mar 6, 2010
Showing with 30 additions and 25 deletions.
  1. +2 −1 INSTALL
  2. +10 −17 SQL/mysql.initial.sql
  3. +6 −4 SQL/mysql.update.sql
  4. +1 −1 SQL/postgres.initial.sql
  5. +5 −0 SQL/postgres.update.sql
  6. +1 −1 SQL/sqlite.initial.sql
  7. +5 −1 SQL/sqlite.update.sql
View
@@ -28,7 +28,8 @@ REQUIREMENTS
- suhosin.session.encrypt disabled
- mbstring.func_overload disabled
* PHP compiled with OpenSSL to connect to IMAPS and to use the spell checker
-* A MySQL, PostgreSQL or MSSQL database engine or the SQLite extension for PHP
+* A MySQL (4.0.8 or newer), PostgreSQL, MSSQL database engine
+ or the SQLite extension for PHP
* One of the above databases with permission to create tables
* An SMTP server (recommended) or PHP configured for mail delivery
View
@@ -52,15 +52,13 @@ CREATE TABLE `messages` (
`headers` text NOT NULL,
`structure` text,
PRIMARY KEY(`message_id`),
+ CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
+ REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
INDEX `created_index` (`created`),
INDEX `index_index` (`user_id`, `cache_key`, `idx`),
UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`)
) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-/* create foreign keys outside of create table, because of MySQL bug #46293 */
-ALTER TABLE `messages` ADD CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
-
-- Table structure for table `cache`
@@ -71,14 +69,12 @@ CREATE TABLE `cache` (
`data` longtext NOT NULL,
`user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY(`cache_id`),
+ 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 */;
-/* create foreign keys outside of create table, because of MySQL bug #46293 */
-ALTER TABLE `cache` ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
-
-- Table structure for table `contacts`
@@ -93,13 +89,11 @@ CREATE TABLE `contacts` (
`vcard` text NULL,
`user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
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`,`email`)
) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-/* create foreign keys outside of create table, because of MySQL bug #46293 */
-ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
-
-- Table structure for table `identities`
@@ -115,12 +109,11 @@ CREATE TABLE `identities` (
`signature` text,
`html_signature` tinyint(1) NOT NULL DEFAULT '0',
`user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
- PRIMARY KEY(`identity_id`)
+ 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`)
) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-/* create foreign keys outside of create table, because of MySQL bug #46293 */
-ALTER TABLE `identities` ADD CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
-
/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
View
@@ -69,16 +69,18 @@ ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
ALTER TABLE `identities` DROP FOREIGN KEY `user_id_fk_identities`;
ALTER TABLE `messages` ADD CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
+ REFERENCES `users`(`user_id`);
ALTER TABLE `cache` ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
+ REFERENCES `users`(`user_id`);
ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
+ REFERENCES `users`(`user_id`);
ALTER TABLE `identities` ADD CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
+ REFERENCES `users`(`user_id`);
ALTER TABLE `contacts` ALTER `name` SET DEFAULT '';
ALTER TABLE `contacts` ALTER `firstname` SET DEFAULT '';
ALTER TABLE `contacts` ALTER `surname` SET DEFAULT '';
+ALTER TABLE `identities` INDEX `user_identities_index` (`user_id`, `del`);
+
/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
View
@@ -78,7 +78,7 @@ CREATE TABLE identities (
html_signature integer DEFAULT 0 NOT NULL
);
-CREATE INDEX identities_user_id_idx ON identities (user_id);
+CREATE INDEX identities_user_id_idx ON identities (user_id, del);
--
View
@@ -43,3 +43,8 @@ TRUNCATE messages;
CREATE INDEX messages_index_idx ON messages (user_id, cache_key, idx);
DROP INDEX contacts_user_id_idx;
CREATE INDEX contacts_user_id_idx ON contacts (user_id, email);
+
+-- Updates from version 0.3.1
+
+DROP INDEX identities_user_id_idx;
+CREATE INDEX identities_user_id_idx ON identities (user_id, del);
View
@@ -56,7 +56,7 @@ CREATE TABLE identities (
html_signature tinyint NOT NULL default '0'
);
-CREATE INDEX ix_identities_user_id ON identities(user_id);
+CREATE INDEX ix_identities_user_id ON identities(user_id, del);
-- --------------------------------------------------------
View
@@ -22,7 +22,6 @@ CREATE TABLE messages (
);
CREATE INDEX ix_messages_user_cache_uid ON messages(user_id,cache_key,uid);
-
CREATE INDEX ix_users_username ON users(username);
CREATE INDEX ix_users_alias ON users(alias);
@@ -43,3 +42,8 @@ CREATE UNIQUE INDEX ix_messages_user_cache_uid ON messages (user_id,cache_key,ui
CREATE INDEX ix_messages_index ON messages (user_id,cache_key,idx);
DROP INDEX ix_contacts_user_id;
CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
+
+-- Updates from version 0.3.1
+
+DROP INDEX ix_identities_user_id;
+CREATE INDEX ix_identities_user_id ON identities (user_id, del);

0 comments on commit 94fe9ca

Please sign in to comment.