From 89bf0de0154186cf2a287cbadfe0f89c0d29f9a7 Mon Sep 17 00:00:00 2001 From: Jim Ewald Date: Fri, 29 Dec 2017 15:37:19 -0800 Subject: [PATCH] Minor script updates that do not affect historical schema progression --- database/create_cloudsession_database.sql | 7 ++ .../create_cloudsession_tables.sql | 103 +++++++----------- database/patches/0001-add-user-coach.sql | 3 +- .../0004-update-cs-default-char-col.sql | 1 - 4 files changed, 48 insertions(+), 66 deletions(-) create mode 100644 database/create_cloudsession_database.sql rename cloudsession-schema.sql => database/create_cloudsession_tables.sql (50%) diff --git a/database/create_cloudsession_database.sql b/database/create_cloudsession_database.sql new file mode 100644 index 0000000..b404f2f --- /dev/null +++ b/database/create_cloudsession_database.sql @@ -0,0 +1,7 @@ +/* + * Create the cloudsession database + */ + +CREATE DATABASE IF NOT EXISTS `cloudsession` + CHARACTER SET = utf8 + COLLATE = utf8_general_ci; diff --git a/cloudsession-schema.sql b/database/create_cloudsession_tables.sql similarity index 50% rename from cloudsession-schema.sql rename to database/create_cloudsession_tables.sql index f4f7c00..fb72912 100644 --- a/cloudsession-schema.sql +++ b/database/create_cloudsession_tables.sql @@ -1,26 +1,36 @@ --- MySQL dump 10.13 Distrib 5.6.24, for Win64 (x86_64) +/* + * Base Cloud Session database schema. + */ + +USE cloudsession; + + +-- +-- Table structure for table `user` -- --- Host: localhost Database: cloudsession --- ------------------------------------------------------ --- Server version 5.7.7-rc-log -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +DROP TABLE IF EXISTS `user`; +CREATE TABLE `user` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `email` varchar(250) DEFAULT NULL, + `password` varchar(100) DEFAULT NULL, + `salt` varchar(50) DEFAULT NULL, + `auth_source` varchar(250) DEFAULT NULL, + `locale` varchar(50) DEFAULT NULL, + `blocked` tinyint(1) DEFAULT NULL, + `confirmed` tinyint(1) DEFAULT NULL, + `screen_name` varchar(250) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `email` (`email`) +) ENGINE=InnoDB + AUTO_INCREMENT=0 + DEFAULT CHARSET=utf8; + -- -- Table structure for table `authentication_token` -- DROP TABLE IF EXISTS `authentication_token`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `authentication_token` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `id_user` bigint(20) DEFAULT NULL, @@ -33,16 +43,15 @@ CREATE TABLE `authentication_token` ( UNIQUE KEY `token` (`token`), KEY `id_user` (`id_user`), CONSTRAINT `authentication_token_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `user` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; +) ENGINE=InnoDB + AUTO_INCREMENT=0 + DEFAULT CHARSET=utf8; -- -- Table structure for table `bucket` -- DROP TABLE IF EXISTS `bucket`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `bucket` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `id_user` bigint(20) DEFAULT NULL, @@ -52,17 +61,15 @@ CREATE TABLE `bucket` ( PRIMARY KEY (`id`), UNIQUE KEY `user_type_unique` (`id_user`,`type`), CONSTRAINT `bucket_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `user` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; +) ENGINE=InnoDB + AUTO_INCREMENT=0 + DEFAULT CHARSET=utf8; -- -- Table structure for table `confirmtoken` -- - DROP TABLE IF EXISTS `confirm_token`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `confirm_token` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `id_user` bigint(20) DEFAULT NULL, @@ -72,16 +79,16 @@ CREATE TABLE `confirm_token` ( UNIQUE KEY `id_user` (`id_user`), UNIQUE KEY `token` (`token`), CONSTRAINT `confirm_token_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `user` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; +) ENGINE=InnoDB + AUTO_INCREMENT=0 + DEFAULT CHARSET=utf8; + -- -- Table structure for table `resettoken` -- DROP TABLE IF EXISTS `reset_token`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `reset_token` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `id_user` bigint(20) DEFAULT NULL, @@ -91,38 +98,6 @@ CREATE TABLE `reset_token` ( UNIQUE KEY `id_user` (`id_user`), UNIQUE KEY `token` (`token`), CONSTRAINT `reset_token_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `user` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `user` --- - -DROP TABLE IF EXISTS `user`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `user` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `email` varchar(250) DEFAULT NULL, - `password` varchar(100) DEFAULT NULL, - `salt` varchar(50) DEFAULT NULL, - `auth_source` varchar(250) DEFAULT NULL, - `locale` varchar(50) DEFAULT NULL, - `blocked` tinyint(1) DEFAULT NULL, - `confirmed` tinyint(1) DEFAULT NULL, - `screen_name` varchar(250) DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `email` (`email`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2015-08-18 20:24:57 +) ENGINE=InnoDB + AUTO_INCREMENT=0 + DEFAULT CHARSET=latin1; diff --git a/database/patches/0001-add-user-coach.sql b/database/patches/0001-add-user-coach.sql index 7e44c66..8c1b1a6 100644 --- a/database/patches/0001-add-user-coach.sql +++ b/database/patches/0001-add-user-coach.sql @@ -1,4 +1,5 @@ /* * Add coach email address field to support email cc option. */ -ALTER TABLE user ADD COLUMN coach_email VARCHAR(250) AFTER screen_name; +USE cloudsession; +ALTER TABLE cloudsession.user ADD COLUMN coach_email VARCHAR(250) AFTER screen_name; diff --git a/database/patches/0004-update-cs-default-char-col.sql b/database/patches/0004-update-cs-default-char-col.sql index bcfd383..9f22a5f 100644 --- a/database/patches/0004-update-cs-default-char-col.sql +++ b/database/patches/0004-update-cs-default-char-col.sql @@ -16,7 +16,6 @@ USE cloudsession; # Set the database defaults # This also sets the collation for individual table columns -;ALTER DATABASE blocklyprop CHARACTER SET utf8 COLLATE utf8_general_ci; ALTER DATABASE cloudsession CHARACTER SET utf8 COLLATE utf8_general_ci; # latin1_general_ci