From a93a039df3d590df6aa683da69c5921a80adcd8b Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Sun, 28 Apr 2013 23:56:17 +0100 Subject: [PATCH] Lots of table fixes --- sql/mysql.sql | 77 +++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/sql/mysql.sql b/sql/mysql.sql index b77a216a..9debe1a7 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -16,51 +16,48 @@ CREATE TABLE `oauth_client_endpoints` ( CONSTRAINT `f_oaclen_clid` FOREIGN KEY (`client_id`) REFERENCES `oauth_clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=INNODB DEFAULT CHARSET=utf8; -CREATE TABLE `oauth_session` ( - `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `client_id` CHAR(40) NOT NULL, - `owner_type` ENUM('user','client') NOT NULL DEFAULT 'user', - `owner_id` VARCHAR(255) NOT NULL, +CREATE TABLE `oauth_sessions` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `client_id` char(40) NOT NULL, + `owner_type` enum('user','client') NOT NULL DEFAULT 'user', + `owner_id` varchar(255) NOT NULL, PRIMARY KEY (`id`), KEY `i_uase_clid_owty_owid` (`client_id`,`owner_type`,`owner_id`), CONSTRAINT `f_oase_clid` FOREIGN KEY (`client_id`) REFERENCES `oauth_clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=INNODB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE `oauth_session_access_token` ( - `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `session_id` INT(10) UNSIGNED NOT NULL, - `access_token` CHAR(40) CHARACTER SET utf8 NOT NULL DEFAULT '', - `access_token_expires` INT(10) UNSIGNED NOT NULL, +CREATE TABLE `oauth_session_access_tokens` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `session_id` int(10) unsigned NOT NULL, + `access_token` char(40) NOT NULL DEFAULT '', + `access_token_expires` int(10) unsigned NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `u_oaseacto_acto_seid` (`access_token`,`session_id`), KEY `f_oaseto_seid` (`session_id`), - CONSTRAINT `f_oaseto_seid` FOREIGN KEY (`session_id`) REFERENCES `oauth_session` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION -) ENGINE=INNODB DEFAULT CHARSET=utf8; - -CREATE TABLE `oauth_session_authcode` ( - `session_id` INT(10) UNSIGNED NOT NULL, - `session_access_token_id` INT(10) UNSIGNED DEFAULT NULL, - `auth_code` CHAR(40) CHARACTER SET utf8 NOT NULL DEFAULT '', - `auth_code_expires` INT(10) UNSIGNED NOT NULL, - PRIMARY KEY (`session_id`), - KEY `f_oaseau_setoid` (`session_access_token_id`), - CONSTRAINT `f_oaseau_seid` FOREIGN KEY (`session_id`) REFERENCES `oauth_session` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION, - CONSTRAINT `f_oaseau_setoid` FOREIGN KEY (`session_access_token_id`) REFERENCES `oauth_session_access_token` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION + CONSTRAINT `f_oaseto_seid` FOREIGN KEY (`session_id`) REFERENCES `oauth_sessions` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE `oauth_session_redirect` ( - `session_id` INT(10) UNSIGNED NOT NULL, - `redirect_uri` VARCHAR(255) CHARACTER SET utf8 NOT NULL DEFAULT '', +CREATE TABLE `oauth_session_authcodes` ( + `session_id` int(10) unsigned NOT NULL, + `auth_code` char(40) NOT NULL DEFAULT '', + `auth_code_expires` int(10) unsigned NOT NULL, PRIMARY KEY (`session_id`), - CONSTRAINT `f_oasere_seid` FOREIGN KEY (`session_id`) REFERENCES `oauth_session` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION -) ENGINE=INNODB DEFAULT CHARSET=utf8; + CONSTRAINT `f_oaseau_seid` FOREIGN KEY (`session_id`) REFERENCES `oauth_sessions` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE `oauth_session_refresh_token` ( - `session_access_token_id` INT(10) UNSIGNED NOT NULL, - `refresh_token` CHAR(40) CHARACTER SET utf8 NOT NULL DEFAULT '', +CREATE TABLE `oauth_session_redirects` ( + `session_id` int(10) unsigned NOT NULL, + `redirect_uri` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`session_id`), + CONSTRAINT `f_oasere_seid` FOREIGN KEY (`session_id`) REFERENCES `oauth_sessions` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `oauth_session_refresh_tokens` ( + `session_access_token_id` int(10) unsigned NOT NULL, + `refresh_token` char(40) NOT NULL DEFAULT '', PRIMARY KEY (`session_access_token_id`), - CONSTRAINT `f_oasetore_setoid` FOREIGN KEY (`session_access_token_id`) REFERENCES `oauth_session_access_token` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION -) ENGINE=INNODB DEFAULT CHARSET=utf8; + CONSTRAINT `f_oasetore_setoid` FOREIGN KEY (`session_access_token_id`) REFERENCES `oauth_session_access_tokens` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `oauth_scopes` ( `id` SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -71,13 +68,13 @@ CREATE TABLE `oauth_scopes` ( UNIQUE KEY `u_oasc_sc` (`key`) ) ENGINE=INNODB DEFAULT CHARSET=utf8; -CREATE TABLE `oauth_session_token_scope` ( - `session_token_scope_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, - `session_access_token_id` INT(10) UNSIGNED NOT NULL, - `scope_id` SMALLINT(5) UNSIGNED NOT NULL, +CREATE TABLE `oauth_session_token_scopes` ( + `session_token_scope_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `session_access_token_id` int(10) unsigned DEFAULT NULL, + `scope_id` smallint(5) unsigned NOT NULL, PRIMARY KEY (`session_token_scope_id`), UNIQUE KEY `u_setosc_setoid_scid` (`session_access_token_id`,`scope_id`), KEY `f_oasetosc_scid` (`scope_id`), - CONSTRAINT `f_oasetosc_setoid` FOREIGN KEY (`session_access_token_id`) REFERENCES `oauth_session_access_token` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION, - CONSTRAINT `f_oasetosc_scid` FOREIGN KEY (`scope_id`) REFERENCES `oauth_scopes` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION -) ENGINE=INNODB DEFAULT CHARSET=utf8; \ No newline at end of file + CONSTRAINT `f_oasetosc_scid` FOREIGN KEY (`scope_id`) REFERENCES `oauth_scopes` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION, + CONSTRAINT `f_oasetosc_setoid` FOREIGN KEY (`session_access_token_id`) REFERENCES `oauth_session_access_tokens` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION +) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file