From 55f02fb9a48102da65bd55b4a66c43b6c6fdc06a Mon Sep 17 00:00:00 2001
From: Trevor Suarez <rican7@gmail.com>
Date: Fri, 23 Jan 2015 15:16:45 -0500
Subject: [PATCH 1/9] Now setting our `sql_mode` to a strict mode in the MySQL
schema setup
---
test/sql/mysql.sql | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/test/sql/mysql.sql b/test/sql/mysql.sql
index 60e529bc6..ff7f6e44e 100644
--- a/test/sql/mysql.sql
+++ b/test/sql/mysql.sql
@@ -1,3 +1,7 @@
+# Set our `sql_mode` for strict testing
+SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'
+
+
CREATE TABLE authors(
author_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
parent_author_id INT,
@@ -109,4 +113,4 @@ CREATE TABLE valuestore (
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
`key` varchar(20) NOT NULL DEFAULT '',
`value` varchar(255) NOT NULL DEFAULT ''
-) ENGINE=InnoDB;
\ No newline at end of file
+) ENGINE=InnoDB;
From 0adb6f27ed23c26a05d74dabca38137c93a8a091 Mon Sep 17 00:00:00 2001
From: Trevor Suarez <rican7@gmail.com>
Date: Fri, 23 Jan 2015 15:17:53 -0500
Subject: [PATCH 2/9] Setting a **global** `sql_mode` for MySQL during
Travis-CI testing
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index e0810cd75..10c15ea6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ install: composer install --prefer-source --dev
before_script:
- echo 'extension = "memcache.so"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- mysql -e 'CREATE DATABASE phpar_test;'
+ - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'"
- psql -c 'CREATE DATABASE phpar_test;' -U postgres
services:
From 1d82493f5c3c53fde0f455f8eb8934fe43e3e6a2 Mon Sep 17 00:00:00 2001
From: Trevor Suarez <rican7@gmail.com>
Date: Fri, 23 Jan 2015 15:34:50 -0500
Subject: [PATCH 3/9] Wrapping the table names in backticks
---
test/sql/mysql.sql | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/test/sql/mysql.sql b/test/sql/mysql.sql
index ff7f6e44e..96c6b2dd8 100644
--- a/test/sql/mysql.sql
+++ b/test/sql/mysql.sql
@@ -2,7 +2,7 @@
SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'
-CREATE TABLE authors(
+CREATE TABLE `authors` (
author_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
parent_author_id INT,
name VARCHAR(25) NOT NULL DEFAULT 'default_name',
@@ -16,7 +16,7 @@ CREATE TABLE authors(
mixedCaseField varchar(50)
) ENGINE=InnoDB;
-CREATE TABLE books(
+CREATE TABLE `books` (
book_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
Author_Id INT,
secondary_author_id INT,
@@ -25,12 +25,12 @@ CREATE TABLE books(
special NUMERIC(10,2) DEFAULT 0
);
-CREATE TABLE publishers(
+CREATE TABLE `publishers` (
publisher_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
name VARCHAR(25) NOT NULL DEFAULT 'default_name'
) ENGINE=InnoDB;
-CREATE TABLE venues (
+CREATE TABLE `venues` (
Id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
name varchar(50),
city varchar(60),
@@ -40,7 +40,7 @@ CREATE TABLE venues (
UNIQUE(name,address)
);
-CREATE TABLE events (
+CREATE TABLE `events` (
id int NOT NULL auto_increment PRIMARY KEY,
venue_id int NULL,
host_id int NOT NULL,
@@ -49,19 +49,19 @@ CREATE TABLE events (
type varchar(15) default NULL
);
-CREATE TABLE hosts(
+CREATE TABLE `hosts` (
id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
name VARCHAR(25)
);
-CREATE TABLE employees (
+CREATE TABLE `employees` (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
first_name VARCHAR(255) NOT NULL,
last_name VARCHAR(255) NOT NULL,
nick_name VARCHAR(255) NOT NULL
);
-CREATE TABLE positions (
+CREATE TABLE `positions` (
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
employee_id int NOT NULL,
title VARCHAR(255) NOT NULL,
@@ -74,42 +74,42 @@ CREATE TABLE `rm-bldg`(
`space out` VARCHAR(1) NOT NULL
);
-CREATE TABLE awesome_people(
+CREATE TABLE `awesome_people` (
id int not null primary key auto_increment,
author_id int,
is_awesome int default 1
);
-CREATE TABLE amenities(
+CREATE TABLE `amenities` (
`amenity_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
`type` varchar(40) NOT NULL DEFAULT ''
);
-CREATE TABLE property(
+CREATE TABLE `property` (
`property_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY
);
-CREATE TABLE property_amenities(
+CREATE TABLE `property_amenities` (
`id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
`amenity_id` int(11) NOT NULL DEFAULT '0',
`property_id` int(11) NOT NULL DEFAULT '0'
);
-CREATE TABLE users (
+CREATE TABLE `users` (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
) ENGINE=InnoDB;
-CREATE TABLE newsletters (
+CREATE TABLE `newsletters` (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
) ENGINE=InnoDB;
-CREATE TABLE user_newsletters (
+CREATE TABLE `user_newsletters` (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
user_id INT NOT NULL,
newsletter_id INT NOT NULL
) ENGINE=InnoDB;
-CREATE TABLE valuestore (
+CREATE TABLE `valuestore` (
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
`key` varchar(20) NOT NULL DEFAULT '',
`value` varchar(255) NOT NULL DEFAULT ''
From cebcf3229fe5a282d76ed7e3dccf76a1ab3f9eeb Mon Sep 17 00:00:00 2001
From: Trevor Suarez <rican7@gmail.com>
Date: Fri, 23 Jan 2015 15:45:24 -0500
Subject: [PATCH 4/9] Fixing up primary key definitions
---
test/sql/mysql.sql | 70 ++++++++++++++++++++++++++++------------------
1 file changed, 43 insertions(+), 27 deletions(-)
diff --git a/test/sql/mysql.sql b/test/sql/mysql.sql
index 96c6b2dd8..1e500efe8 100644
--- a/test/sql/mysql.sql
+++ b/test/sql/mysql.sql
@@ -3,7 +3,7 @@ SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'
CREATE TABLE `authors` (
- author_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ author_id INT NOT NULL AUTO_INCREMENT,
parent_author_id INT,
name VARCHAR(25) NOT NULL DEFAULT 'default_name',
updated_at datetime,
@@ -13,59 +13,67 @@ CREATE TABLE `authors` (
some_text text,
some_enum enum('a','b','c'),
encrypted_password varchar(50),
- mixedCaseField varchar(50)
+ mixedCaseField varchar(50),
+ PRIMARY KEY (`author_id`)
) ENGINE=InnoDB;
CREATE TABLE `books` (
- book_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ book_id INT NOT NULL AUTO_INCREMENT,
Author_Id INT,
secondary_author_id INT,
name VARCHAR(50),
numeric_test VARCHAR(10) DEFAULT '0',
- special NUMERIC(10,2) DEFAULT 0
+ special NUMERIC(10,2) DEFAULT 0,
+ PRIMARY KEY (`book_id`)
);
CREATE TABLE `publishers` (
- publisher_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
- name VARCHAR(25) NOT NULL DEFAULT 'default_name'
+ publisher_id INT NOT NULL AUTO_INCREMENT,
+ name VARCHAR(25) NOT NULL DEFAULT 'default_name',
+ PRIMARY KEY (`publisher_id`)
) ENGINE=InnoDB;
CREATE TABLE `venues` (
- Id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ id int NOT NULL AUTO_INCREMENT,
name varchar(50),
city varchar(60),
state char(2),
address varchar(50),
phone varchar(10) default NULL,
+ PRIMARY KEY (`id`),
UNIQUE(name,address)
);
CREATE TABLE `events` (
- id int NOT NULL auto_increment PRIMARY KEY,
+ id int NOT NULL auto_increment,
venue_id int NULL,
host_id int NOT NULL,
title varchar(60) NOT NULL,
description varchar(50),
+ PRIMARY KEY (`id`),
type varchar(15) default NULL
);
CREATE TABLE `hosts` (
- id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
- name VARCHAR(25)
+ id INT NOT NULL AUTO_INCREMENT,
+ name VARCHAR(25),
+ PRIMARY KEY (`id`)
);
CREATE TABLE `employees` (
- id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ id INT NOT NULL AUTO_INCREMENT,
first_name VARCHAR(255) NOT NULL,
last_name VARCHAR(255) NOT NULL,
- nick_name VARCHAR(255) NOT NULL
+ nick_name VARCHAR(255) NOT NULL,
+ PRIMARY KEY (`id`)
);
CREATE TABLE `positions` (
- id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ id int NOT NULL AUTO_INCREMENT,
employee_id int NOT NULL,
title VARCHAR(255) NOT NULL,
- active SMALLINT NOT NULL
+ active SMALLINT NOT NULL,
+ PRIMARY KEY (`id`)
);
CREATE TABLE `rm-bldg`(
@@ -75,42 +83,50 @@ CREATE TABLE `rm-bldg`(
);
CREATE TABLE `awesome_people` (
- id int not null primary key auto_increment,
+ id int not null auto_increment,
author_id int,
- is_awesome int default 1
+ is_awesome int default 1,
+ PRIMARY KEY (`id`)
);
CREATE TABLE `amenities` (
- `amenity_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
- `type` varchar(40) NOT NULL DEFAULT ''
+ `amenity_id` int(11) NOT NULL AUTO_INCREMENT,
+ `type` varchar(40) NOT NULL DEFAULT '',
+ PRIMARY KEY (`amenity_id`)
);
CREATE TABLE `property` (
- `property_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY
+ `property_id` int(11) NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (`property_id`)
);
CREATE TABLE `property_amenities` (
- `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
`amenity_id` int(11) NOT NULL DEFAULT '0',
- `property_id` int(11) NOT NULL DEFAULT '0'
+ `property_id` int(11) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
);
CREATE TABLE `users` (
- id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
+ id INT NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `newsletters` (
- id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
+ id INT NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `user_newsletters` (
- id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ id INT NOT NULL AUTO_INCREMENT,
user_id INT NOT NULL,
- newsletter_id INT NOT NULL
+ newsletter_id INT NOT NULL,
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `valuestore` (
- `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ `id` INT NOT NULL AUTO_INCREMENT,
`key` varchar(20) NOT NULL DEFAULT '',
- `value` varchar(255) NOT NULL DEFAULT ''
+ `value` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB;
From 2bac2ed18ec7e8fa81df988f613110379a9ad5ca Mon Sep 17 00:00:00 2001
From: Trevor Suarez <rican7@gmail.com>
Date: Fri, 23 Jan 2015 15:48:51 -0500
Subject: [PATCH 5/9] Quick SQL formatting to match MySQL Workbench's 2-space
standard
---
test/sql/mysql.sql | 130 ++++++++++++++++++++++-----------------------
1 file changed, 65 insertions(+), 65 deletions(-)
diff --git a/test/sql/mysql.sql b/test/sql/mysql.sql
index 1e500efe8..958e57824 100644
--- a/test/sql/mysql.sql
+++ b/test/sql/mysql.sql
@@ -3,90 +3,90 @@ SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'
CREATE TABLE `authors` (
- author_id INT NOT NULL AUTO_INCREMENT,
- parent_author_id INT,
- name VARCHAR(25) NOT NULL DEFAULT 'default_name',
- updated_at datetime,
- created_at datetime,
- some_Date date,
- some_time time,
- some_text text,
- some_enum enum('a','b','c'),
- encrypted_password varchar(50),
- mixedCaseField varchar(50),
- PRIMARY KEY (`author_id`)
+ author_id INT NOT NULL AUTO_INCREMENT,
+ parent_author_id INT,
+ name VARCHAR(25) NOT NULL DEFAULT 'default_name',
+ updated_at datetime,
+ created_at datetime,
+ some_Date date,
+ some_time time,
+ some_text text,
+ some_enum enum('a','b','c'),
+ encrypted_password varchar(50),
+ mixedCaseField varchar(50),
+ PRIMARY KEY (`author_id`)
) ENGINE=InnoDB;
CREATE TABLE `books` (
- book_id INT NOT NULL AUTO_INCREMENT,
- Author_Id INT,
- secondary_author_id INT,
- name VARCHAR(50),
- numeric_test VARCHAR(10) DEFAULT '0',
- special NUMERIC(10,2) DEFAULT 0,
- PRIMARY KEY (`book_id`)
+ book_id INT NOT NULL AUTO_INCREMENT,
+ Author_Id INT,
+ secondary_author_id INT,
+ name VARCHAR(50),
+ numeric_test VARCHAR(10) DEFAULT '0',
+ special NUMERIC(10,2) DEFAULT 0,
+ PRIMARY KEY (`book_id`)
);
CREATE TABLE `publishers` (
- publisher_id INT NOT NULL AUTO_INCREMENT,
- name VARCHAR(25) NOT NULL DEFAULT 'default_name',
- PRIMARY KEY (`publisher_id`)
+ publisher_id INT NOT NULL AUTO_INCREMENT,
+ name VARCHAR(25) NOT NULL DEFAULT 'default_name',
+ PRIMARY KEY (`publisher_id`)
) ENGINE=InnoDB;
CREATE TABLE `venues` (
- id int NOT NULL AUTO_INCREMENT,
- name varchar(50),
- city varchar(60),
- state char(2),
- address varchar(50),
- phone varchar(10) default NULL,
- PRIMARY KEY (`id`),
- UNIQUE(name,address)
+ id int NOT NULL AUTO_INCREMENT,
+ name varchar(50),
+ city varchar(60),
+ state char(2),
+ address varchar(50),
+ phone varchar(10) default NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE(name,address)
);
CREATE TABLE `events` (
- id int NOT NULL auto_increment,
- venue_id int NULL,
- host_id int NOT NULL,
- title varchar(60) NOT NULL,
- description varchar(50),
- PRIMARY KEY (`id`),
- type varchar(15) default NULL
+ id int NOT NULL auto_increment,
+ venue_id int NULL,
+ host_id int NOT NULL,
+ title varchar(60) NOT NULL,
+ description varchar(50),
+ PRIMARY KEY (`id`),
+ type varchar(15) default NULL
);
CREATE TABLE `hosts` (
- id INT NOT NULL AUTO_INCREMENT,
- name VARCHAR(25),
- PRIMARY KEY (`id`)
+ id INT NOT NULL AUTO_INCREMENT,
+ name VARCHAR(25),
+ PRIMARY KEY (`id`)
);
CREATE TABLE `employees` (
- id INT NOT NULL AUTO_INCREMENT,
- first_name VARCHAR(255) NOT NULL,
- last_name VARCHAR(255) NOT NULL,
- nick_name VARCHAR(255) NOT NULL,
- PRIMARY KEY (`id`)
+ id INT NOT NULL AUTO_INCREMENT,
+ first_name VARCHAR(255) NOT NULL,
+ last_name VARCHAR(255) NOT NULL,
+ nick_name VARCHAR(255) NOT NULL,
+ PRIMARY KEY (`id`)
);
CREATE TABLE `positions` (
- id int NOT NULL AUTO_INCREMENT,
- employee_id int NOT NULL,
- title VARCHAR(255) NOT NULL,
- active SMALLINT NOT NULL,
- PRIMARY KEY (`id`)
+ id int NOT NULL AUTO_INCREMENT,
+ employee_id int NOT NULL,
+ title VARCHAR(255) NOT NULL,
+ active SMALLINT NOT NULL,
+ PRIMARY KEY (`id`)
);
CREATE TABLE `rm-bldg`(
- `rm-id` INT NOT NULL,
- `rm-name` VARCHAR(10) NOT NULL,
- `space out` VARCHAR(1) NOT NULL
+ `rm-id` INT NOT NULL,
+ `rm-name` VARCHAR(10) NOT NULL,
+ `space out` VARCHAR(1) NOT NULL
);
CREATE TABLE `awesome_people` (
- id int not null auto_increment,
- author_id int,
- is_awesome int default 1,
- PRIMARY KEY (`id`)
+ id int not null auto_increment,
+ author_id int,
+ is_awesome int default 1,
+ PRIMARY KEY (`id`)
);
CREATE TABLE `amenities` (
@@ -108,20 +108,20 @@ CREATE TABLE `property_amenities` (
);
CREATE TABLE `users` (
- id INT NOT NULL AUTO_INCREMENT,
- PRIMARY KEY (`id`)
+ id INT NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `newsletters` (
- id INT NOT NULL AUTO_INCREMENT,
- PRIMARY KEY (`id`)
+ id INT NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `user_newsletters` (
- id INT NOT NULL AUTO_INCREMENT,
- user_id INT NOT NULL,
- newsletter_id INT NOT NULL,
- PRIMARY KEY (`id`)
+ id INT NOT NULL AUTO_INCREMENT,
+ user_id INT NOT NULL,
+ newsletter_id INT NOT NULL,
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `valuestore` (
From 0b95c01077ea5ba8340b7ce3f391957ca3f10676 Mon Sep 17 00:00:00 2001
From: Trevor Suarez <rican7@gmail.com>
Date: Fri, 23 Jan 2015 15:55:47 -0500
Subject: [PATCH 6/9] Proper casing and backticks
---
test/sql/mysql.sql | 104 ++++++++++++++++++++++-----------------------
1 file changed, 52 insertions(+), 52 deletions(-)
diff --git a/test/sql/mysql.sql b/test/sql/mysql.sql
index 958e57824..6218b9b02 100644
--- a/test/sql/mysql.sql
+++ b/test/sql/mysql.sql
@@ -3,89 +3,89 @@ SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'
CREATE TABLE `authors` (
- author_id INT NOT NULL AUTO_INCREMENT,
- parent_author_id INT,
- name VARCHAR(25) NOT NULL DEFAULT 'default_name',
- updated_at datetime,
- created_at datetime,
+ `author_id` int NOT NULL AUTO_INCREMENT,
+ `parent_author_id` int,
+ `name` varchar(25) NOT NULL DEFAULT 'default_name',
+ `updated_at` datetime,
+ `created_at` datetime,
some_Date date,
- some_time time,
- some_text text,
- some_enum enum('a','b','c'),
- encrypted_password varchar(50),
- mixedCaseField varchar(50),
+ `some_time` time,
+ `some_text` text,
+ `some_enum` enum('a','b','c'),
+ `encrypted_password` varchar(50),
+ `mixedCaseField` varchar(50),
PRIMARY KEY (`author_id`)
) ENGINE=InnoDB;
CREATE TABLE `books` (
- book_id INT NOT NULL AUTO_INCREMENT,
- Author_Id INT,
- secondary_author_id INT,
- name VARCHAR(50),
- numeric_test VARCHAR(10) DEFAULT '0',
- special NUMERIC(10,2) DEFAULT 0,
+ `book_id` int NOT NULL AUTO_INCREMENT,
+ `author_id` int,
+ `secondary_author_id` int,
+ `name` varchar(50),
+ `numeric_test` varchar(10) DEFAULT '0',
+ `special` numeric(10,2) DEFAULT 0,
PRIMARY KEY (`book_id`)
);
CREATE TABLE `publishers` (
- publisher_id INT NOT NULL AUTO_INCREMENT,
- name VARCHAR(25) NOT NULL DEFAULT 'default_name',
+ `publisher_id` int NOT NULL AUTO_INCREMENT,
+ `name` varchar(25) NOT NULL DEFAULT 'default_name',
PRIMARY KEY (`publisher_id`)
) ENGINE=InnoDB;
CREATE TABLE `venues` (
- id int NOT NULL AUTO_INCREMENT,
- name varchar(50),
- city varchar(60),
- state char(2),
- address varchar(50),
- phone varchar(10) default NULL,
+ `id` int NOT NULL AUTO_INCREMENT,
+ `name` varchar(50),
+ `city` varchar(60),
+ `state` char(2),
+ `address` varchar(50),
+ `phone` varchar(10) default NULL,
PRIMARY KEY (`id`),
UNIQUE(name,address)
);
CREATE TABLE `events` (
- id int NOT NULL auto_increment,
- venue_id int NULL,
- host_id int NOT NULL,
- title varchar(60) NOT NULL,
- description varchar(50),
+ `id` int NOT NULL AUTO_INCREMENT,
+ `venue_id` int NULL,
+ `host_id` int NOT NULL,
+ `title` varchar(60) NOT NULL,
+ `description` varchar(50),
PRIMARY KEY (`id`),
- type varchar(15) default NULL
+ `type` varchar(15) default NULL
);
CREATE TABLE `hosts` (
- id INT NOT NULL AUTO_INCREMENT,
- name VARCHAR(25),
+ `id` int NOT NULL AUTO_INCREMENT,
+ `name` varchar(25),
PRIMARY KEY (`id`)
);
CREATE TABLE `employees` (
- id INT NOT NULL AUTO_INCREMENT,
- first_name VARCHAR(255) NOT NULL,
- last_name VARCHAR(255) NOT NULL,
- nick_name VARCHAR(255) NOT NULL,
+ `id` int NOT NULL AUTO_INCREMENT,
+ `first_name` varchar(255) NOT NULL,
+ `last_name` varchar(255) NOT NULL,
+ `nick_name` varchar(255) NOT NULL,
PRIMARY KEY (`id`)
);
CREATE TABLE `positions` (
- id int NOT NULL AUTO_INCREMENT,
- employee_id int NOT NULL,
- title VARCHAR(255) NOT NULL,
- active SMALLINT NOT NULL,
+ `id` int NOT NULL AUTO_INCREMENT,
+ `employee_id` int NOT NULL,
+ `title` varchar(255) NOT NULL,
+ `active` smallint NOT NULL,
PRIMARY KEY (`id`)
);
CREATE TABLE `rm-bldg`(
- `rm-id` INT NOT NULL,
- `rm-name` VARCHAR(10) NOT NULL,
- `space out` VARCHAR(1) NOT NULL
+ `rm-id` int NOT NULL,
+ `rm-name` varchar(10) NOT NULL,
+ `space out` varchar(1) NOT NULL
);
CREATE TABLE `awesome_people` (
- id int not null auto_increment,
- author_id int,
- is_awesome int default 1,
+ `id` int NOT NULL AUTO_INCREMENT,
+ `author_id` int,
+ `is_awesome` int default 1,
PRIMARY KEY (`id`)
);
@@ -108,24 +108,24 @@ CREATE TABLE `property_amenities` (
);
CREATE TABLE `users` (
- id INT NOT NULL AUTO_INCREMENT,
+ `id` int NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `newsletters` (
- id INT NOT NULL AUTO_INCREMENT,
+ `id` int NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `user_newsletters` (
- id INT NOT NULL AUTO_INCREMENT,
- user_id INT NOT NULL,
- newsletter_id INT NOT NULL,
+ `id` int NOT NULL AUTO_INCREMENT,
+ `user_id` int NOT NULL,
+ `newsletter_id` int NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `valuestore` (
- `id` INT NOT NULL AUTO_INCREMENT,
+ `id` int NOT NULL AUTO_INCREMENT,
`key` varchar(20) NOT NULL DEFAULT '',
`value` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
From dccbd55cf1b16a10a89fe4be6c68c15b005febfe Mon Sep 17 00:00:00 2001
From: Trevor Suarez <rican7@gmail.com>
Date: Fri, 23 Jan 2015 16:02:39 -0500
Subject: [PATCH 7/9] Specifying the integer display width
---
test/sql/mysql.sql | 52 +++++++++++++++++++++++-----------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/test/sql/mysql.sql b/test/sql/mysql.sql
index 6218b9b02..1176b2552 100644
--- a/test/sql/mysql.sql
+++ b/test/sql/mysql.sql
@@ -3,8 +3,8 @@ SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'
CREATE TABLE `authors` (
- `author_id` int NOT NULL AUTO_INCREMENT,
- `parent_author_id` int,
+ `author_id` int(11) NOT NULL AUTO_INCREMENT,
+ `parent_author_id` int(11),
`name` varchar(25) NOT NULL DEFAULT 'default_name',
`updated_at` datetime,
`created_at` datetime,
@@ -18,9 +18,9 @@ CREATE TABLE `authors` (
) ENGINE=InnoDB;
CREATE TABLE `books` (
- `book_id` int NOT NULL AUTO_INCREMENT,
- `author_id` int,
- `secondary_author_id` int,
+ `book_id` int(11) NOT NULL AUTO_INCREMENT,
+ `author_id` int(11),
+ `secondary_author_id` int(11),
`name` varchar(50),
`numeric_test` varchar(10) DEFAULT '0',
`special` numeric(10,2) DEFAULT 0,
@@ -28,26 +28,26 @@ CREATE TABLE `books` (
);
CREATE TABLE `publishers` (
- `publisher_id` int NOT NULL AUTO_INCREMENT,
+ `publisher_id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(25) NOT NULL DEFAULT 'default_name',
PRIMARY KEY (`publisher_id`)
) ENGINE=InnoDB;
CREATE TABLE `venues` (
- `id` int NOT NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(50),
`city` varchar(60),
`state` char(2),
`address` varchar(50),
`phone` varchar(10) default NULL,
PRIMARY KEY (`id`),
- UNIQUE(name,address)
+ UNIQUE(`name`,`address`)
);
CREATE TABLE `events` (
- `id` int NOT NULL AUTO_INCREMENT,
- `venue_id` int NULL,
- `host_id` int NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `venue_id` int(11) NULL,
+ `host_id` int(11) NOT NULL,
`title` varchar(60) NOT NULL,
`description` varchar(50),
PRIMARY KEY (`id`),
@@ -55,13 +55,13 @@ CREATE TABLE `events` (
);
CREATE TABLE `hosts` (
- `id` int NOT NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(25),
PRIMARY KEY (`id`)
);
CREATE TABLE `employees` (
- `id` int NOT NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
`first_name` varchar(255) NOT NULL,
`last_name` varchar(255) NOT NULL,
`nick_name` varchar(255) NOT NULL,
@@ -69,23 +69,23 @@ CREATE TABLE `employees` (
);
CREATE TABLE `positions` (
- `id` int NOT NULL AUTO_INCREMENT,
- `employee_id` int NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `employee_id` int(11) NOT NULL,
`title` varchar(255) NOT NULL,
- `active` smallint NOT NULL,
+ `active` smallint(11) NOT NULL,
PRIMARY KEY (`id`)
);
CREATE TABLE `rm-bldg`(
- `rm-id` int NOT NULL,
+ `rm-id` int(11) NOT NULL,
`rm-name` varchar(10) NOT NULL,
`space out` varchar(1) NOT NULL
);
CREATE TABLE `awesome_people` (
- `id` int NOT NULL AUTO_INCREMENT,
- `author_id` int,
- `is_awesome` int default 1,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `author_id` int(11),
+ `is_awesome` int(11) default 1,
PRIMARY KEY (`id`)
);
@@ -108,24 +108,24 @@ CREATE TABLE `property_amenities` (
);
CREATE TABLE `users` (
- `id` int NOT NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `newsletters` (
- `id` int NOT NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `user_newsletters` (
- `id` int NOT NULL AUTO_INCREMENT,
- `user_id` int NOT NULL,
- `newsletter_id` int NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `user_id` int(11) NOT NULL,
+ `newsletter_id` int(11) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
CREATE TABLE `valuestore` (
- `id` int NOT NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
`key` varchar(20) NOT NULL DEFAULT '',
`value` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
From c1c3f62abf7e179e2bbc5e982fda129f50fd86be Mon Sep 17 00:00:00 2001
From: Trevor Suarez <rican7@gmail.com>
Date: Fri, 23 Jan 2015 16:25:37 -0500
Subject: [PATCH 8/9] .... I forgot a semi-colon. Sick.
---
test/sql/mysql.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/sql/mysql.sql b/test/sql/mysql.sql
index 1176b2552..96cdf5d7b 100644
--- a/test/sql/mysql.sql
+++ b/test/sql/mysql.sql
@@ -1,5 +1,5 @@
# Set our `sql_mode` for strict testing
-SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'
+SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES';
CREATE TABLE `authors` (
From 1291641ca90d84e4b1129e272ad5f3fe5e669a20 Mon Sep 17 00:00:00 2001
From: Trevor Suarez <rican7@gmail.com>
Date: Fri, 23 Jan 2015 16:42:50 -0500
Subject: [PATCH 9/9] Some small fixes
---
test/sql/mysql.sql | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/sql/mysql.sql b/test/sql/mysql.sql
index 96cdf5d7b..06f71d1ad 100644
--- a/test/sql/mysql.sql
+++ b/test/sql/mysql.sql
@@ -8,7 +8,7 @@ CREATE TABLE `authors` (
`name` varchar(25) NOT NULL DEFAULT 'default_name',
`updated_at` datetime,
`created_at` datetime,
- some_Date date,
+ `some_date` date,
`some_time` time,
`some_text` text,
`some_enum` enum('a','b','c'),
@@ -50,8 +50,8 @@ CREATE TABLE `events` (
`host_id` int(11) NOT NULL,
`title` varchar(60) NOT NULL,
`description` varchar(50),
- PRIMARY KEY (`id`),
- `type` varchar(15) default NULL
+ `type` varchar(15) default NULL,
+ PRIMARY KEY (`id`)
);
CREATE TABLE `hosts` (