Merge remote-tracking branch 'origin/dev' into authentication
# Conflicts: # database/schema.sql
This commit is contained in:
Michal Kváček
+39
-41
@@ -1,5 +1,5 @@
|
||||
-- MySQL Script generated by MySQL Workbench
|
||||
-- St 20. leden 2016, 19:50:50 CET
|
||||
-- Čt 21. leden 2016, 01:17:14 CET
|
||||
-- Model: New Model Version: 1.0
|
||||
-- MySQL Workbench Forward Engineering
|
||||
|
||||
@@ -12,16 +12,14 @@ SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
|
||||
-- -----------------------------------------------------
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Schema minicms
|
||||
-- Table `users`
|
||||
-- -----------------------------------------------------
|
||||
-- -----------------------------------------------------
|
||||
-- Table `user`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `user` (
|
||||
CREATE TABLE IF NOT EXISTS `users` (
|
||||
`id` INT NOT NULL AUTO_INCREMENT,
|
||||
`email` VARCHAR(64) NOT NULL COMMENT 'E-mail is used as a contact and also as a username',
|
||||
`username` VARCHAR(64) NOT NULL COMMENT 'Username can be used also for login. Default value is users email.',
|
||||
`password` VARCHAR(128) NOT NULL COMMENT 'Password hash',
|
||||
`role` ENUM('visitor', 'editor', 'admin') NOT NULL DEFAULT 'visitor' COMMENT 'User\'s role determines his permissions in the system.',
|
||||
`remember_token` VARCHAR(128) NULL DEFAULT NULL COMMENT 'Token used for \"remember me\" feature',
|
||||
`name` VARCHAR(128) NULL DEFAULT NULL,
|
||||
`status` ENUM('deleted', 'blocked', 'active') NOT NULL DEFAULT 'active',
|
||||
@@ -32,9 +30,9 @@ COMMENT = 'Table with users who are allowed to log into system';
|
||||
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `module`
|
||||
-- Table `modules`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `module` (
|
||||
CREATE TABLE IF NOT EXISTS `modules` (
|
||||
`handler` VARCHAR(64) NOT NULL,
|
||||
`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`name` VARCHAR(64) NOT NULL,
|
||||
@@ -44,9 +42,9 @@ ENGINE = InnoDB;
|
||||
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `file`
|
||||
-- Table `files`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `file` (
|
||||
CREATE TABLE IF NOT EXISTS `files` (
|
||||
`id` INT NOT NULL,
|
||||
`user_id` INT NOT NULL,
|
||||
`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
@@ -57,7 +55,7 @@ CREATE TABLE IF NOT EXISTS `file` (
|
||||
INDEX `fk_file_user1_idx` (`user_id` ASC),
|
||||
CONSTRAINT `fk_file_user1`
|
||||
FOREIGN KEY (`user_id`)
|
||||
REFERENCES `user` (`id`)
|
||||
REFERENCES `users` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION)
|
||||
ENGINE = InnoDB
|
||||
@@ -65,9 +63,9 @@ COMMENT = 'Table containing files which were uploaded into system.';
|
||||
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `content`
|
||||
-- Table `contents`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `content` (
|
||||
CREATE TABLE IF NOT EXISTS `contents` (
|
||||
`id` INT NOT NULL,
|
||||
`user_id` INT NOT NULL,
|
||||
`module_handler` VARCHAR(64) NOT NULL,
|
||||
@@ -92,17 +90,17 @@ CREATE TABLE IF NOT EXISTS `content` (
|
||||
INDEX `fk_content_file1_idx` (`title_photo` ASC),
|
||||
CONSTRAINT `fk_content_user1`
|
||||
FOREIGN KEY (`user_id`)
|
||||
REFERENCES `user` (`id`)
|
||||
REFERENCES `users` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION,
|
||||
CONSTRAINT `fk_content_module1`
|
||||
FOREIGN KEY (`module_handler`)
|
||||
REFERENCES `module` (`handler`)
|
||||
REFERENCES `modules` (`handler`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION,
|
||||
CONSTRAINT `fk_content_file1`
|
||||
FOREIGN KEY (`title_photo`)
|
||||
REFERENCES `file` (`id`)
|
||||
REFERENCES `files` (`id`)
|
||||
ON DELETE SET NULL
|
||||
ON UPDATE CASCADE)
|
||||
ENGINE = InnoDB
|
||||
@@ -128,12 +126,12 @@ CREATE TABLE IF NOT EXISTS `content_history` (
|
||||
INDEX `fk_content_history_content1_idx` (`content_id` ASC),
|
||||
CONSTRAINT `fk_content_history_users`
|
||||
FOREIGN KEY (`user_id`)
|
||||
REFERENCES `user` (`id`)
|
||||
REFERENCES `users` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION,
|
||||
CONSTRAINT `fk_content_history_content1`
|
||||
FOREIGN KEY (`content_id`)
|
||||
REFERENCES `content` (`id`)
|
||||
REFERENCES `contents` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION)
|
||||
ENGINE = InnoDB
|
||||
@@ -141,9 +139,9 @@ COMMENT = 'Table for holding history of changes on some content.';
|
||||
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `widget_type`
|
||||
-- Table `widget_types`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `widget_type` (
|
||||
CREATE TABLE IF NOT EXISTS `widget_types` (
|
||||
`handler` VARCHAR(64) NOT NULL COMMENT 'Class wich handles everything about this widget type',
|
||||
`name` VARCHAR(64) NOT NULL COMMENT 'Name is used only in admin for better readability.',
|
||||
`description` TEXT NULL DEFAULT NULL COMMENT 'This field also improves readability.',
|
||||
@@ -153,9 +151,9 @@ COMMENT = 'Widget type table contains information about all installed widgets. T
|
||||
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `widget`
|
||||
-- Table `widgets`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `widget` (
|
||||
CREATE TABLE IF NOT EXISTS `widgets` (
|
||||
`id` INT NOT NULL,
|
||||
`widget_type_handler` VARCHAR(64) NOT NULL,
|
||||
`user_id` INT NOT NULL COMMENT 'User ID who created this widget',
|
||||
@@ -168,12 +166,12 @@ CREATE TABLE IF NOT EXISTS `widget` (
|
||||
INDEX `fk_widget_widget_type1_idx` (`widget_type_handler` ASC),
|
||||
CONSTRAINT `fk_widget_user1`
|
||||
FOREIGN KEY (`user_id`)
|
||||
REFERENCES `user` (`id`)
|
||||
REFERENCES `users` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION,
|
||||
CONSTRAINT `fk_widget_widget_type1`
|
||||
FOREIGN KEY (`widget_type_handler`)
|
||||
REFERENCES `widget_type` (`handler`)
|
||||
REFERENCES `widget_types` (`handler`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION)
|
||||
ENGINE = InnoDB
|
||||
@@ -181,9 +179,9 @@ COMMENT = 'Widget is a small piece of content, which can be inserted into widget
|
||||
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `widget_area`
|
||||
-- Table `widget_areas`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `widget_area` (
|
||||
CREATE TABLE IF NOT EXISTS `widget_areas` (
|
||||
`id` INT NOT NULL,
|
||||
`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
@@ -209,21 +207,21 @@ CREATE TABLE IF NOT EXISTS `widget_in_widget_area` (
|
||||
INDEX `position` (`position` ASC),
|
||||
CONSTRAINT `fk_widget_has_widget_area_widget1`
|
||||
FOREIGN KEY (`widget_id`)
|
||||
REFERENCES `widget` (`id`)
|
||||
REFERENCES `widgets` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION,
|
||||
CONSTRAINT `fk_widget_has_widget_area_widget_area1`
|
||||
FOREIGN KEY (`widget_area_id`)
|
||||
REFERENCES `widget_area` (`id`)
|
||||
REFERENCES `widget_areas` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION)
|
||||
ENGINE = InnoDB;
|
||||
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `custom_field`
|
||||
-- Table `custom_fields`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `custom_field` (
|
||||
CREATE TABLE IF NOT EXISTS `custom_fields` (
|
||||
`id` INT NOT NULL,
|
||||
`handler` VARCHAR(64) NOT NULL COMMENT 'Class name, which handles saving and retrieving given custom field.',
|
||||
`name` VARCHAR(128) NULL,
|
||||
@@ -250,21 +248,21 @@ CREATE TABLE IF NOT EXISTS `user_has_custom_field` (
|
||||
INDEX `fk_user_has_custom_field_user1_idx` (`user_id` ASC),
|
||||
CONSTRAINT `fk_user_has_custom_field_user1`
|
||||
FOREIGN KEY (`user_id`)
|
||||
REFERENCES `user` (`id`)
|
||||
REFERENCES `users` (`id`)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE CASCADE,
|
||||
CONSTRAINT `fk_user_has_custom_field_custom_field1`
|
||||
FOREIGN KEY (`custom_field_id`)
|
||||
REFERENCES `custom_field` (`id`)
|
||||
REFERENCES `custom_fields` (`id`)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE CASCADE)
|
||||
ENGINE = InnoDB;
|
||||
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `custom_field_type`
|
||||
-- Table `custom_field_types`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `custom_field_type` (
|
||||
CREATE TABLE IF NOT EXISTS `custom_field_types` (
|
||||
`id` INT NOT NULL,
|
||||
`name` VARCHAR(45) NOT NULL,
|
||||
`custom_field_id` INT NOT NULL,
|
||||
@@ -273,7 +271,7 @@ CREATE TABLE IF NOT EXISTS `custom_field_type` (
|
||||
INDEX `fk_custom_field_type_custom_field1_idx` (`custom_field_id` ASC),
|
||||
CONSTRAINT `fk_custom_field_type_custom_field1`
|
||||
FOREIGN KEY (`custom_field_id`)
|
||||
REFERENCES `custom_field` (`id`)
|
||||
REFERENCES `custom_fields` (`id`)
|
||||
ON DELETE RESTRICT
|
||||
ON UPDATE NO ACTION)
|
||||
ENGINE = InnoDB
|
||||
@@ -292,21 +290,21 @@ CREATE TABLE IF NOT EXISTS `module_has_custom_field` (
|
||||
INDEX `fk_module_has_custom_field_module1_idx` (`module_handler` ASC),
|
||||
CONSTRAINT `fk_module_has_custom_field_module1`
|
||||
FOREIGN KEY (`module_handler`)
|
||||
REFERENCES `module` (`handler`)
|
||||
REFERENCES `modules` (`handler`)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE CASCADE,
|
||||
CONSTRAINT `fk_module_has_custom_field_custom_field1`
|
||||
FOREIGN KEY (`custom_field_id`)
|
||||
REFERENCES `custom_field` (`id`)
|
||||
REFERENCES `custom_fields` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION)
|
||||
ENGINE = InnoDB;
|
||||
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `action_log_type`
|
||||
-- Table `action_log_types`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `action_log_type` (
|
||||
CREATE TABLE IF NOT EXISTS `action_log_types` (
|
||||
`id` INT NOT NULL,
|
||||
`name` VARCHAR(45) NULL,
|
||||
PRIMARY KEY (`id`))
|
||||
@@ -328,12 +326,12 @@ CREATE TABLE IF NOT EXISTS `action_log` (
|
||||
INDEX `fk_action_log_user1_idx` (`user_id` ASC),
|
||||
CONSTRAINT `fk_action_log_action_log_type1`
|
||||
FOREIGN KEY (`type_id`)
|
||||
REFERENCES `action_log_type` (`id`)
|
||||
REFERENCES `action_log_types` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION,
|
||||
CONSTRAINT `fk_action_log_user1`
|
||||
FOREIGN KEY (`user_id`)
|
||||
REFERENCES `user` (`id`)
|
||||
REFERENCES `users` (`id`)
|
||||
ON DELETE NO ACTION
|
||||
ON UPDATE NO ACTION)
|
||||
ENGINE = InnoDB
|
||||
|
||||
Reference in New Issue
Block a user