From 3d309ac68b375cd586bd048ddb90cfbee69bd168 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Mon, 21 May 2018 16:07:34 -0600 Subject: [PATCH] Update database schema --- database.mwb | Bin 19719 -> 20021 bytes database.sql | 11 +++++++++-- database_upgrade/1.0.1_1.1.sql | 12 +++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/database.mwb b/database.mwb index fddadc1f2c94bcd8f76efbf7c3c562fc00330590..e6e114c2baf174bfe8fa85235abf78c1e4cf9929 100644 GIT binary patch delta 19596 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�kP@hp3Q9=M8pLiDeMCqt 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 Ks~KC@jQ$16+v+m_ diff --git a/database.sql b/database.sql index 052b496..579f874 100644 --- a/database.sql +++ b/database.sql @@ -1,5 +1,5 @@ -- MySQL Script generated by MySQL Workbench --- Thu 21 Dec 2017 01:19:57 AM MST +-- Mon 21 May 2018 04:05:27 PM MDT -- Model: New Model Version: 1.0 -- MySQL Workbench Forward Engineering @@ -51,6 +51,7 @@ CREATE TABLE IF NOT EXISTS `accounthub`.`accounts` ( `realname` VARCHAR(255) NOT NULL, `email` VARCHAR(255) NULL DEFAULT 'NOEMAIL@EXAMPLE.COM', `authsecret` VARCHAR(100) NULL, + `pin` VARCHAR(10) NULL, `phone1` VARCHAR(45) NOT NULL, `phone2` VARCHAR(45) NOT NULL, `acctstatus` INT NOT NULL DEFAULT 0, @@ -252,7 +253,8 @@ ENGINE = InnoDB; CREATE TABLE IF NOT EXISTS `accounthub`.`mobile_codes` ( `codeid` INT NOT NULL AUTO_INCREMENT, `uid` INT NOT NULL, - `code` VARCHAR(45) NULL, + `code` VARCHAR(45) NOT NULL DEFAULT '', + `description` VARCHAR(255) NOT NULL DEFAULT '', PRIMARY KEY (`codeid`), UNIQUE INDEX `codeid_UNIQUE` (`codeid` ASC), INDEX `fk_mobile_codes_accounts1_idx` (`uid` ASC), @@ -366,6 +368,11 @@ INSERT INTO `accounthub`.`permissions` (`permid`, `permcode`, `perminfo`) VALUES INSERT INTO `accounthub`.`permissions` (`permid`, `permcode`, `perminfo`) VALUES (301, 'QWIKCLOCK_MANAGE', 'Edit punches and other data for managed users'); INSERT INTO `accounthub`.`permissions` (`permid`, `permcode`, `perminfo`) VALUES (302, 'QWIKCLOCK_EDITSELF', 'Edit own punches and other data'); INSERT INTO `accounthub`.`permissions` (`permid`, `permcode`, `perminfo`) VALUES (303, 'QWIKCLOCK_ADMIN', 'Add and edit shifts and other data for all users'); +INSERT INTO `accounthub`.`permissions` (`permid`, `permcode`, `perminfo`) VALUES (400, 'SITEWRITER', 'Manage and edit websites, messages, and analytics'); +INSERT INTO `accounthub`.`permissions` (`permid`, `permcode`, `perminfo`) VALUES (401, 'SITEWRITER_CONTACT', 'Manage messages sent via website contact forms'); +INSERT INTO `accounthub`.`permissions` (`permid`, `permcode`, `perminfo`) VALUES (402, 'SITEWRITER_ANALYTICS', 'View website analytics'); +INSERT INTO `accounthub`.`permissions` (`permid`, `permcode`, `perminfo`) VALUES (403, 'SITEWRITER_EDIT', 'Edit website content'); +INSERT INTO `accounthub`.`permissions` (`permid`, `permcode`, `perminfo`) VALUES (404, 'SITEWRITER_FILES', 'Manage and upload files'); COMMIT; diff --git a/database_upgrade/1.0.1_1.1.sql b/database_upgrade/1.0.1_1.1.sql index 5dc29b9..0bcd983 100644 --- a/database_upgrade/1.0.1_1.1.sql +++ b/database_upgrade/1.0.1_1.1.sql @@ -19,4 +19,14 @@ CHANGE COLUMN `groupid` `groupid` INT(11) NOT NULL AUTO_INCREMENT; SET FOREIGN_KEY_CHECKS = 1; ALTER TABLE `accounts` -ADD COLUMN `pin` VARCHAR(10) NULL DEFAULT NULL AFTER `authsecret`; \ No newline at end of file +ADD COLUMN `pin` VARCHAR(10) NULL DEFAULT NULL AFTER `authsecret`; + +ALTER TABLE `mobile_codes` +CHANGE COLUMN `code` `code` VARCHAR(45) NOT NULL DEFAULT '', +ADD COLUMN `description` VARCHAR(255) NOT NULL DEFAULT '' AFTER `code`; + +INSERT INTO `permissions` (`permid`, `permcode`, `perminfo`) VALUES (400, 'SITEWRITER', 'Manage and edit websites, messages, and analytics'); +INSERT INTO `permissions` (`permid`, `permcode`, `perminfo`) VALUES (401, 'SITEWRITER_CONTACT', 'Manage messages sent via website contact forms'); +INSERT INTO `permissions` (`permid`, `permcode`, `perminfo`) VALUES (402, 'SITEWRITER_ANALYTICS', 'View website analytics'); +INSERT INTO `permissions` (`permid`, `permcode`, `perminfo`) VALUES (403, 'SITEWRITER_EDIT', 'Edit website content'); +INSERT INTO `permissions` (`permid`, `permcode`, `perminfo`) VALUES (404, 'SITEWRITER_FILES', 'Manage and upload files'); \ No newline at end of file