Add API key type column to apikeys, update database schema

database.sql

@@ -1,5 +1,5 @@
 -- MySQL Script generated by MySQL Workbench
--- Fri 09 Nov 2018 01:08:12 AM MST
+-- Mon 11 Feb 2019 02:58:22 PM MST
 -- Model: New Model    Version: 1.0
 -- MySQL Workbench Forward Engineering
 
@@ -70,46 +70,13 @@ CREATE TABLE IF NOT EXISTS `accounts` (
 ENGINE = InnoDB;
 
 
--- -----------------------------------------------------
--- Table `apps`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `apps` (
-  `appid` INT NOT NULL AUTO_INCREMENT,
-  `appname` VARCHAR(45) NULL,
-  `appcode` VARCHAR(45) NULL,
-  PRIMARY KEY (`appid`),
-  UNIQUE INDEX `appid_UNIQUE` (`appid` ASC))
-ENGINE = InnoDB;
-
-
--- -----------------------------------------------------
--- Table `available_apps`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `available_apps` (
-  `appid` INT NOT NULL,
-  `uid` INT NOT NULL,
-  PRIMARY KEY (`appid`, `uid`),
-  INDEX `fk_apps_has_accounts_accounts1_idx` (`uid` ASC),
-  INDEX `fk_apps_has_accounts_apps1_idx` (`appid` ASC),
-  CONSTRAINT `fk_apps_has_accounts_apps1`
-    FOREIGN KEY (`appid`)
-    REFERENCES `apps` (`appid`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_apps_has_accounts_accounts1`
-    FOREIGN KEY (`uid`)
-    REFERENCES `accounts` (`uid`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB;
-
-
 -- -----------------------------------------------------
 -- Table `apikeys`
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `apikeys` (
   `key` VARCHAR(60) NOT NULL,
   `notes` TEXT NULL,
+  `type` VARCHAR(45) NOT NULL DEFAULT 'FULL',
   PRIMARY KEY (`key`))
 ENGINE = InnoDB;
 
@@ -346,6 +313,28 @@ CREATE TABLE IF NOT EXISTS `userkeys` (
 ENGINE = InnoDB;
 
 
+-- -----------------------------------------------------
+-- Table `userloginkeys`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `userloginkeys` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `key` VARCHAR(255) NOT NULL,
+  `expires` DATETIME NULL,
+  `uid` INT NULL,
+  `appname` VARCHAR(255) NOT NULL,
+  `appicon` TINYTEXT NULL,
+  PRIMARY KEY (`id`, `key`),
+  UNIQUE INDEX `id_UNIQUE` (`id` ASC),
+  UNIQUE INDEX `key_UNIQUE` (`key` ASC),
+  INDEX `fk_userloginkeys_accounts1_idx` (`uid` ASC),
+  CONSTRAINT `fk_userloginkeys_accounts1`
+    FOREIGN KEY (`uid`)
+    REFERENCES `accounts` (`uid`)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
 SET SQL_MODE=@OLD_SQL_MODE;
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
@@ -368,8 +357,7 @@ COMMIT;
 -- -----------------------------------------------------
 START TRANSACTION;
 INSERT INTO `accttypes` (`typeid`, `typecode`) VALUES (1, 'LOCAL');
-INSERT INTO `accttypes` (`typeid`, `typecode`) VALUES (2, 'LDAP');
+INSERT INTO `accttypes` (`typeid`, `typecode`) VALUES (2, 'EXTERNAL');
-INSERT INTO `accttypes` (`typeid`, `typecode`) VALUES (3, 'LIGHT');
 
 COMMIT;
 

database_upgrade/2.1_2.2.sql

@@ -27,4 +27,6 @@ DEFAULT CHARACTER SET = utf8;
 ALTER TABLE `userloginkeys`
 ADD COLUMN `appname` VARCHAR(255) NOT NULL AFTER `uid`;
 ALTER TABLE `userloginkeys`
-ADD COLUMN `appicon` TINYTEXT NULL DEFAULT NULL AFTER `appname`;
+ADD COLUMN `appicon` TINYTEXT NULL DEFAULT NULL AFTER `appname`;
+ALTER TABLE `apikeys`
+ADD COLUMN `type` VARCHAR(45) NOT NULL DEFAULT 'FULL' AFTER `notes`;