From 440616d6ff63f15f65ba00c0e89a0f20bb3e3315 Mon Sep 17 00:00:00 2001 From: Boris Gulay Date: Wed, 11 May 2016 11:32:54 +0300 Subject: [PATCH] Cleaned up SQL directory. I will start with pgsql only. --- SQL/mysql.20140112.sql | 9 ------ SQL/mysql.initial.sql | 26 ----------------- SQL/mysql.sql | 18 ------------ SQL/pgsql.20140112.sql | 8 ------ SQL/pgsql.initial.sql | 62 ++++++++++++++++++++++++++++------------- SQL/postgres.sql | 14 ---------- SQL/sqlite.20140112.sql | 8 ------ SQL/sqlite.initial.sql | 22 --------------- 8 files changed, 43 insertions(+), 124 deletions(-) delete mode 100644 SQL/mysql.20140112.sql delete mode 100644 SQL/mysql.initial.sql delete mode 100644 SQL/mysql.sql delete mode 100644 SQL/pgsql.20140112.sql delete mode 100644 SQL/postgres.sql delete mode 100644 SQL/sqlite.20140112.sql delete mode 100644 SQL/sqlite.initial.sql diff --git a/SQL/mysql.20140112.sql b/SQL/mysql.20140112.sql deleted file mode 100644 index 46197e4..0000000 --- a/SQL/mysql.20140112.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE IF NOT EXISTS `identities_imap_hosts` ( - `id` int(10) NOT NULL AUTO_INCREMENT, - `domain` varchar(255) COLLATE utf8_general_ci NOT NULL, - `host` varchar(255) COLLATE utf8_general_ci DEFAULT NULL, - `ts` datetime NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci AUTO_INCREMENT=1 ; - -UPDATE `system` SET `value`='initial|20140112' WHERE `name`='myrc_identities_imap'; \ No newline at end of file diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql deleted file mode 100644 index 29e430e..0000000 --- a/SQL/mysql.initial.sql +++ /dev/null @@ -1,26 +0,0 @@ -CREATE TABLE IF NOT EXISTS `identities_imap` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `user_id` int(10) unsigned NOT NULL, - `iid` int(10) unsigned NOT NULL, - `username` varchar(256) DEFAULT NULL, - `password` text, - `server` varchar(256) DEFAULT NULL, - `enabled` int(1) unsigned NOT NULL DEFAULT '0', - `label` text, - `preferences` text, - PRIMARY KEY (`id`), - KEY `user_id` (`user_id`), - KEY `iid` (`iid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; - -CREATE TABLE IF NOT EXISTS `system` ( - `name` varchar(64) NOT NULL, - `value` mediumtext, - PRIMARY KEY(`name`) -); - -INSERT INTO `system` (name, value) VALUES ('myrc_identities_imap', 'initial'); - -ALTER TABLE `identities_imap` - ADD CONSTRAINT `identities_imap_ibfk_2` FOREIGN KEY (`iid`) REFERENCES `identities` (`identity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - ADD CONSTRAINT `identities_imap_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE; \ No newline at end of file diff --git a/SQL/mysql.sql b/SQL/mysql.sql deleted file mode 100644 index 8ebbde4..0000000 --- a/SQL/mysql.sql +++ /dev/null @@ -1,18 +0,0 @@ -CREATE TABLE IF NOT EXISTS `identities_imap` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `user_id` int(10) unsigned NOT NULL, - `iid` int(10) unsigned NOT NULL, - `username` varchar(256) DEFAULT NULL, - `password` text, - `server` varchar(256) DEFAULT NULL, - `enabled` int(1) unsigned NOT NULL DEFAULT '0', - `label` text, - `preferences` text, - PRIMARY KEY (`id`), - KEY `user_id` (`user_id`), - KEY `iid` (`iid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; - -ALTER TABLE `identities_imap` - ADD CONSTRAINT `identities_imap_ibfk_2` FOREIGN KEY (`iid`) REFERENCES `identities` (`identity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - ADD CONSTRAINT `identities_imap_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE; \ No newline at end of file diff --git a/SQL/pgsql.20140112.sql b/SQL/pgsql.20140112.sql deleted file mode 100644 index 659d345..0000000 --- a/SQL/pgsql.20140112.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TABLE identities_imap_hosts ( - id serial PRIMARY KEY, - domain varchar(255) NOT NULL, - host varchar(255) DEFAULT NULL, - ts timestamp NOT NULL -); - -UPDATE "system" SET value='initial|20140112' WHERE name='myrc_identities_imap'; diff --git a/SQL/pgsql.initial.sql b/SQL/pgsql.initial.sql index 7df171a..9f49803 100644 --- a/SQL/pgsql.initial.sql +++ b/SQL/pgsql.initial.sql @@ -1,21 +1,45 @@ -CREATE TABLE identities_imap ( - id serial PRIMARY KEY, - user_id integer NOT NULL REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE, - iid integer NOT NULL REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE, - username varchar(256) DEFAULT NULL, - password text, - server varchar(256) DEFAULT NULL, - enabled smallint NOT NULL DEFAULT 0, - label text, - preferences text +CREATE TABLE ident_switch +( + id + serial + PRIMARY KEY, + user_id + integer + NOT NULL + REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE, + iid + integer + NOT NULL + REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE + UNIQUE, + username + varchar(64) + NOT NULL, + password + varchar(64), + host + varchar(64) + NOT NULL, + port + integer + NOT NULL + CHECK(port > 0 AND port <= 65535), + secure + boolean + NOT NULL, + delimiter + char(1), + enabled + boolean + NOT NULL + DEFAULT false, + label + varchar(32) + NOT NULL, + UNIQUE (user_id, label) ); -CREATE TABLE IF NOT EXISTS "system" ( - name varchar(64) NOT NULL PRIMARY KEY, - value text -); - -INSERT INTO "system" (name, value) VALUES ('myrc_identities_imap', 'initial'); - -CREATE INDEX ix_identities_imap_user_id ON identities_imap(user_id); -CREATE INDEX ix_identities_imap_iid ON identities_imap(iid); +CREATE INDEX + IX_ident_switch_user_id +ON + ident_switch(user_id); diff --git a/SQL/postgres.sql b/SQL/postgres.sql deleted file mode 100644 index 76c6ebf..0000000 --- a/SQL/postgres.sql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE TABLE identities_imap ( - id serial PRIMARY KEY, - user_id integer NOT NULL REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE, - iid integer NOT NULL REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE, - username varchar(256) DEFAULT NULL, - password text, - server varchar(256) DEFAULT NULL, - enabled smallint NOT NULL DEFAULT 0, - label text, - preferences text -); - -CREATE INDEX ix_identities_imap_user_id ON identities_imap(user_id); -CREATE INDEX ix_identities_imap_iid ON identities_imap(iid); diff --git a/SQL/sqlite.20140112.sql b/SQL/sqlite.20140112.sql deleted file mode 100644 index b84c2c4..0000000 --- a/SQL/sqlite.20140112.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TABLE IF NOT EXISTS 'identities_imap_hosts' ( - 'id' INTEGER NOT NULL PRIMARY KEY ASC, - 'domain' varchar(255) NOT NULL, - 'host' varchar(255) DEFAULT NULL, - 'ts' DATETIME NOT NULL -); - -UPDATE 'system' SET value='initial|20140112' WHERE name='myrc_identities_imap'; diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql deleted file mode 100644 index 79b8f20..0000000 --- a/SQL/sqlite.initial.sql +++ /dev/null @@ -1,22 +0,0 @@ -CREATE TABLE IF NOT EXISTS 'identities_imap' ( - 'id' INTEGER NOT NULL PRIMARY KEY ASC, - 'user_id' int(10) NOT NULL, - 'iid' int(10) NOT NULL, - 'username' varchar(256) DEFAULT NULL, - 'password' text, - 'server' varchar(256) DEFAULT NULL, - 'enabled' int(1) NOT NULL DEFAULT '0', - 'label' text, - 'preferences' text, - CONSTRAINT 'identities_imap_ibfk_1' FOREIGN KEY ('user_id') REFERENCES 'users' - ('user_id') ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE IF NOT EXISTS 'system' ( - name varchar(64) NOT NULL PRIMARY KEY, - value text NOT NULL -); - -INSERT INTO system (name, value) VALUES ('myrc_identities_imap', 'initial'); - -CREATE INDEX identities_imap_iid ON 'identities_imap'('iid'); \ No newline at end of file