From 565c472918e7f9707cd8d7909ad5dbcc5a921fdf Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Mon, 06 Aug 2012 05:08:58 -0400 Subject: [PATCH] Removed users.alias column, added option ('user_aliases') to use email address from identities as username (#1488581) --- SQL/sqlite.initial.sql | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql index 2c4f9dc..f5b5615 100644 --- a/SQL/sqlite.initial.sql +++ b/SQL/sqlite.initial.sql @@ -5,7 +5,6 @@ -- CREATE TABLE cache ( - cache_id integer NOT NULL PRIMARY KEY, 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', @@ -24,18 +23,18 @@ CREATE TABLE contacts ( contact_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', + 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 varchar(255) 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, email); +CREATE INDEX ix_contacts_user_id ON contacts(user_id, del); CREATE TABLE contactgroups ( @@ -81,6 +80,7 @@ ); CREATE INDEX ix_identities_user_id ON identities(user_id, del); +CREATE INDEX ix_identities_email ON identities(email, del); -- -------------------------------------------------------- @@ -93,7 +93,6 @@ user_id integer NOT NULL PRIMARY KEY, 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 DEFAULT NULL, language varchar(5), @@ -101,7 +100,6 @@ ); CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host); -CREATE INDEX ix_users_alias ON users(alias); -- -------------------------------------------------------- -- Gitblit v1.9.1