From 98f34a80fb6208bb827a4d67dde15c0f7193007b Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Tue, 22 May 2018 01:43:31 -0600 Subject: [PATCH] Update database SQL --- database.sql | 95 +++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/database.sql b/database.sql index 0f0becf..4b9a3a2 100644 --- a/database.sql +++ b/database.sql @@ -1,5 +1,5 @@ -- MySQL Script generated by MySQL Workbench --- Wed 07 Feb 2018 07:08:36 PM MST +-- Tue 22 May 2018 01:42:53 AM MDT -- Model: New Model Version: 1.0 -- MySQL Workbench Forward Engineering @@ -12,15 +12,9 @@ SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; -- ----------------------------------------------------- -- ----------------------------------------------------- --- Schema newspen --- ----------------------------------------------------- -CREATE SCHEMA IF NOT EXISTS `newspen` DEFAULT CHARACTER SET utf8 ; -USE `newspen` ; - +-- Table `pub_permissions` -- ----------------------------------------------------- --- Table `newspen`.`pub_permissions` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `newspen`.`pub_permissions` ( +CREATE TABLE IF NOT EXISTS `pub_permissions` ( `permid` INT NOT NULL AUTO_INCREMENT, `permname` VARCHAR(45) NULL, PRIMARY KEY (`permid`), @@ -29,9 +23,9 @@ ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `newspen`.`page_sizes` +-- Table `page_sizes` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `newspen`.`page_sizes` ( +CREATE TABLE IF NOT EXISTS `page_sizes` ( `sizeid` INT NOT NULL AUTO_INCREMENT, `sizename` VARCHAR(45) NOT NULL, `sizewidth` VARCHAR(10) NOT NULL, @@ -42,9 +36,9 @@ ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `newspen`.`publications` +-- Table `publications` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `newspen`.`publications` ( +CREATE TABLE IF NOT EXISTS `publications` ( `pubid` INT NOT NULL AUTO_INCREMENT, `pubname` TEXT NOT NULL, `uid` INT NOT NULL, @@ -55,27 +49,29 @@ CREATE TABLE IF NOT EXISTS `newspen`.`publications` ( `pwd` VARCHAR(60) NULL, `page_size` INT NOT NULL, `landscape` TINYINT(1) NOT NULL DEFAULT 0, + `mailedon` DATETIME NULL, + `mailedto` INT NULL, PRIMARY KEY (`pubid`), UNIQUE INDEX `pubid_UNIQUE` (`pubid` ASC), INDEX `fk_publications_pub_permissions1_idx` (`permid` ASC), INDEX `fk_publications_page_sizes1_idx` (`page_size` ASC), CONSTRAINT `fk_publications_pub_permissions1` FOREIGN KEY (`permid`) - REFERENCES `newspen`.`pub_permissions` (`permid`) + REFERENCES `pub_permissions` (`permid`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_publications_page_sizes1` FOREIGN KEY (`page_size`) - REFERENCES `newspen`.`page_sizes` (`sizeid`) + REFERENCES `page_sizes` (`sizeid`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `newspen`.`tile_styles` +-- Table `tile_styles` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `newspen`.`tile_styles` ( +CREATE TABLE IF NOT EXISTS `tile_styles` ( `styleid` INT NOT NULL AUTO_INCREMENT, `css` MEDIUMTEXT NOT NULL, `stylename` VARCHAR(100) NOT NULL, @@ -86,9 +82,9 @@ ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `newspen`.`tiles` +-- Table `tiles` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `newspen`.`tiles` ( +CREATE TABLE IF NOT EXISTS `tiles` ( `tileid` INT NOT NULL AUTO_INCREMENT, `pubid` INT NOT NULL, `page` INT NULL, @@ -102,21 +98,21 @@ CREATE TABLE IF NOT EXISTS `newspen`.`tiles` ( INDEX `fk_tiles_tile_styles1_idx` (`styleid` ASC), CONSTRAINT `fk_tiles_publications` FOREIGN KEY (`pubid`) - REFERENCES `newspen`.`publications` (`pubid`) + REFERENCES `publications` (`pubid`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_tiles_tile_styles1` FOREIGN KEY (`styleid`) - REFERENCES `newspen`.`tile_styles` (`styleid`) + REFERENCES `tile_styles` (`styleid`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `newspen`.`mail_lists` +-- Table `mail_lists` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `newspen`.`mail_lists` ( +CREATE TABLE IF NOT EXISTS `mail_lists` ( `listid` INT NOT NULL AUTO_INCREMENT, `listname` VARCHAR(100) NOT NULL, `uid` INT NOT NULL, @@ -126,9 +122,9 @@ ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `newspen`.`addresses` +-- Table `addresses` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `newspen`.`addresses` ( +CREATE TABLE IF NOT EXISTS `addresses` ( `aid` INT NOT NULL AUTO_INCREMENT, `listid` INT NOT NULL, `email` VARCHAR(255) NOT NULL, @@ -138,53 +134,60 @@ CREATE TABLE IF NOT EXISTS `newspen`.`addresses` ( INDEX `fk_addresses_mail_lists1_idx` (`listid` ASC), CONSTRAINT `fk_addresses_mail_lists1` FOREIGN KEY (`listid`) - REFERENCES `newspen`.`mail_lists` (`listid`) + REFERENCES `mail_lists` (`listid`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB; +-- ----------------------------------------------------- +-- Table `rate_limit` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `rate_limit` ( + `ipaddr` VARCHAR(45) NOT NULL, + `lastaction` DATETIME NULL, + PRIMARY KEY (`ipaddr`)) +ENGINE = InnoDB; + + SET SQL_MODE=@OLD_SQL_MODE; SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; -- ----------------------------------------------------- --- Data for table `newspen`.`pub_permissions` +-- Data for table `pub_permissions` -- ----------------------------------------------------- START TRANSACTION; -USE `newspen`; -INSERT INTO `newspen`.`pub_permissions` (`permid`, `permname`) VALUES (1, 'OWNER'); -INSERT INTO `newspen`.`pub_permissions` (`permid`, `permname`) VALUES (2, 'LOGGEDIN'); -INSERT INTO `newspen`.`pub_permissions` (`permid`, `permname`) VALUES (3, 'LINK'); +INSERT INTO `pub_permissions` (`permid`, `permname`) VALUES (1, 'OWNER'); +INSERT INTO `pub_permissions` (`permid`, `permname`) VALUES (2, 'LOGGEDIN'); +INSERT INTO `pub_permissions` (`permid`, `permname`) VALUES (3, 'LINK'); COMMIT; -- ----------------------------------------------------- --- Data for table `newspen`.`page_sizes` +-- Data for table `page_sizes` -- ----------------------------------------------------- START TRANSACTION; -USE `newspen`; -INSERT INTO `newspen`.`page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (1, 'US Letter', '8.5in', '11in'); -INSERT INTO `newspen`.`page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (2, 'A4', '210mm', '297mm'); -INSERT INTO `newspen`.`page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (3, 'US Half Letter', '5.5in', '8.5in'); -INSERT INTO `newspen`.`page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (4, 'US Legal', '8.5in', '14in'); -INSERT INTO `newspen`.`page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (5, 'A3', '297mm', '420mm'); -INSERT INTO `newspen`.`page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (6, 'A5', '148mm', '210mm'); +INSERT INTO `page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (1, 'US Letter', '8.5in', '11in'); +INSERT INTO `page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (2, 'A4', '210mm', '297mm'); +INSERT INTO `page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (3, 'US Half Letter', '5.5in', '8.5in'); +INSERT INTO `page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (4, 'US Legal', '8.5in', '14in'); +INSERT INTO `page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (5, 'A3', '297mm', '420mm'); +INSERT INTO `page_sizes` (`sizeid`, `sizename`, `sizewidth`, `sizeheight`) VALUES (6, 'A5', '148mm', '210mm'); COMMIT; -- ----------------------------------------------------- --- Data for table `newspen`.`tile_styles` +-- Data for table `tile_styles` -- ----------------------------------------------------- START TRANSACTION; -USE `newspen`; -INSERT INTO `newspen`.`tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (1, '', 'None', 'No style'); -INSERT INTO `newspen`.`tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (2, 'box-shadow: 0px -1px 10px 5px rgba(0,0,0,0.75);\npadding: 3px;\nbackground-color: rgba(255,255,255,.75);', 'Shadow', 'Elevate your content with a shadow.'); -INSERT INTO `newspen`.`tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (3, 'border: 1px solid var(--primary);\npadding: 1px 8px;', 'Line', 'A plain border.'); -INSERT INTO `newspen`.`tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (4, 'border: 6px dotted var(--primary);\npadding: 0px 8px;', 'Dots', 'Large round dots.'); -INSERT INTO `newspen`.`tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (5, 'border: 6px double var(--medium);\npadding: 0px 8px;', 'Double', 'A double line.'); +INSERT INTO `tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (1, '', 'None', 'No style'); +INSERT INTO `tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (2, 'box-shadow: 0px -1px 10px 5px rgba(0,0,0,0.75);\npadding: 3px;\nbackground-color: rgba(255,255,255,.75);', 'Shadow', 'Elevate your content with a shadow.'); +INSERT INTO `tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (3, 'border: 1px solid var(--primary);\npadding: 1px 8px;', 'Line', 'A plain border.'); +INSERT INTO `tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (4, 'border: 6px dotted var(--primary);\npadding: 0px 8px;', 'Dots', 'Large round dots.'); +INSERT INTO `tile_styles` (`styleid`, `css`, `stylename`, `styledesc`) VALUES (5, 'border: 6px double var(--medium);\npadding: 0px 8px;', 'Double', 'A double line.'); COMMIT;