Skip to content

Minor script updates that do not affect historical schema progression #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 29, 2017
Merged

Minor script updates that do not affect historical schema progression #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions database/create_cloudsession_database.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Create the cloudsession database
*/

CREATE DATABASE IF NOT EXISTS `cloudsession`
CHARACTER SET = utf8
COLLATE = utf8_general_ci;
103 changes: 39 additions & 64 deletions cloudsession-schema.sql → database/create_cloudsession_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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;
3 changes: 2 additions & 1 deletion database/patches/0001-add-user-coach.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
1 change: 0 additions & 1 deletion database/patches/0004-update-cs-default-char-col.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down