Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Changed sql scripts to allow non-ascii chars in user names (#1483959)
  • Loading branch information
thomascube committed May 17, 2007
1 parent a549a92 commit 5870871
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
6 changes: 6 additions & 0 deletions SQL/mysql.update.sql
Expand Up @@ -9,3 +9,9 @@ ALTER TABLE `messages`


ALTER TABLE `identities` ALTER TABLE `identities`
ADD `html_signature` tinyint(1) default 0 NOT NULL; ADD `html_signature` tinyint(1) default 0 NOT NULL;

-- Uncomment these lines if you're using MySQL 4.1 or higher
-- ALTER TABLE `users`
-- DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci,
-- CHANGE `username` `username` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-- CHANGE `alias` `alias` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
13 changes: 6 additions & 7 deletions SQL/mysql5.initial.sql
@@ -1,6 +1,5 @@
-- RoundCube Webmail initial database structure -- RoundCube Webmail initial database structure
-- Version 0.1-beta2 -- Version 0.1-rc1
--


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


Expand Down Expand Up @@ -31,7 +30,7 @@ CREATE TABLE `users` (
`language` varchar(5) NOT NULL DEFAULT 'en', `language` varchar(5) NOT NULL DEFAULT 'en',
`preferences` text NOT NULL DEFAULT '', `preferences` text NOT NULL DEFAULT '',
PRIMARY KEY(`user_id`) PRIMARY KEY(`user_id`)
) TYPE=MYISAM CHARACTER SET ascii COLLATE ascii_general_ci; ) TYPE=MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;




-- Table structure for table `messages` -- Table structure for table `messages`
Expand All @@ -56,7 +55,7 @@ CREATE TABLE `messages` (
INDEX `idx`(`idx`), INDEX `idx`(`idx`),
INDEX `uid`(`uid`), INDEX `uid`(`uid`),
UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`), UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`),
CONSTRAINT `User_ID_FK_messages` FOREIGN KEY (`user_id`) CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`) REFERENCES `users`(`user_id`)
ON DELETE CASCADE ON DELETE CASCADE
ON UPDATE CASCADE ON UPDATE CASCADE
Expand All @@ -75,7 +74,7 @@ CREATE TABLE `cache` (
PRIMARY KEY(`cache_id`), PRIMARY KEY(`cache_id`),
INDEX `cache_key`(`cache_key`), INDEX `cache_key`(`cache_key`),
INDEX `session_id`(`session_id`), INDEX `session_id`(`session_id`),
CONSTRAINT `User_ID_FK_cache` FOREIGN KEY (`user_id`) CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`) REFERENCES `users`(`user_id`)
ON DELETE CASCADE ON DELETE CASCADE
ON UPDATE CASCADE ON UPDATE CASCADE
Expand All @@ -95,7 +94,7 @@ CREATE TABLE `contacts` (
`vcard` text NOT NULL, `vcard` text NOT NULL,
`user_id` int(10) UNSIGNED NOT NULL DEFAULT '0', `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY(`contact_id`), PRIMARY KEY(`contact_id`),
CONSTRAINT `User_ID_FK_contacts` FOREIGN KEY (`user_id`) CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`) REFERENCES `users`(`user_id`)
ON DELETE CASCADE ON DELETE CASCADE
ON UPDATE CASCADE ON UPDATE CASCADE
Expand All @@ -117,7 +116,7 @@ CREATE TABLE `identities` (
`html_signature` tinyint(1) NOT NULL DEFAULT '0', `html_signature` tinyint(1) NOT NULL DEFAULT '0',
`user_id` int(10) UNSIGNED 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`) CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`) REFERENCES `users`(`user_id`)
ON DELETE CASCADE ON DELETE CASCADE
ON UPDATE CASCADE ON UPDATE CASCADE
Expand Down

0 comments on commit 5870871

Please sign in to comment.