Merge sailshq/master into mk2/change_mysql_version_to_2_15_0

Author: mk2

.travis.yml

@@ -1,13 +1,46 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#   ╔╦╗╦═╗╔═╗╦  ╦╦╔═╗ ┬ ┬┌┬┐┬                           #
+#    ║ ╠╦╝╠═╣╚╗╔╝║╚═╗ └┬┘││││                           #
+#  o ╩ ╩╚═╩ ╩ ╚╝ ╩╚═╝o ┴ ┴ ┴┴─┘                         #
+#                                                       #
+# This file configures Travis CI.                       #
+# (i.e. how we run the tests... mainly)                 #
+#                                                       #
+# https://docs.travis-ci.com/user/customizing-the-build #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
 language: node_js
+
 node_js:
-  - "6"
-  - "5"
   - "4"
+  - "6"
+  - "8"
+  - "node"
+
+branches:
+  only:
+    - master
+
+notifications:
+  email:
+    - [email protected]
+
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#   ╔═╗╦ ╦╔═╗╔╦╗╔═╗╔╦╗┬┌─┐┌─┐┌┬┐┬┌─┐┌┐┌┌─┐              #
+#   ║  ║ ║╚═╗ ║ ║ ║║║║│┌─┘├─┤ │ ││ ││││└─┐              #
+#   ╚═╝╚═╝╚═╝ ╩ ╚═╝╩ ╩┴└─┘┴ ┴ ┴ ┴└─┘┘└┘└─┘              #
+#                                                       #
+# Custom stuff specific to this package:                #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
 sudo: false
+
 services:
   - mysql
 env:
   - DB_USER=mp DB_PASS='mp'
+
 before_script:
   - mysql -e 'create database mppg;'
   - mysql -e "create user 'mp'@'localhost' identified by 'mp';"

Dockerfile

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2015-present mikermcneil
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE

@@ -8,7 +8,7 @@ Structured Node.js bindings for MySQL.
 > See https://github.com/node-machine/driver-interface for more background information about this package.
 
 
-## Installation   [![NPM version](https://badge.fury.io/js/machinepack-mysql.svg)](http://badge.fury.io/js/machinepack-mysql) [![Build Status](https://travis-ci.org/treelinehq/machinepack-mysql.png?branch=master)](https://travis-ci.org/treelinehq/machinepack-mysql)
+## Installation   [![NPM version](https://badge.fury.io/js/machinepack-mysql.svg)](http://badge.fury.io/js/machinepack-mysql) [![Build Status](https://travis-ci.org/sailshq/machinepack-mysql.png?branch=master)](https://travis-ci.org/sailshq/machinepack-mysql)
 
 ```sh
 $ npm install machinepack-mysql
@@ -30,7 +30,7 @@ For more examples, or if you get stuck or have questions, click [here](http://sa
 To report a bug, [click here](http://sailsjs.com/bugs).
 
 
-## Contributing   [![Build Status](https://travis-ci.org/balderdashy/machinepack-mysql.svg?branch=master)](https://travis-ci.org/balderdashy/machinepack-mysql)
+## Contributing   [![Build Status](https://travis-ci.org/sailshq/machinepack-mysql.svg?branch=master)](https://travis-ci.org/sailshq/machinepack-mysql)
 
 Please observe the guidelines and conventions laid out in the [Sails project contribution guide](http://sailsjs.com/contribute) when opening issues or submitting pull requests.
 
@@ -42,7 +42,7 @@ Thanks to [felixge](https://github.com/felixge) and [dougwilson](https://github.
 
 ## License
 
-MIT © 2015-2017 The Sails Company
+MIT © 2015-present Mike McNeil
 
 This package, like the [Sails framework](http://sailsjs.com), is free and open-source under the [MIT License](http://sailsjs.com/license).
 

README.md

@@ -108,7 +108,7 @@ module.exports = {
 
 
     // Attach a flag to the meta object to denote that the query was generated
-    // with Knex and that it's valuesToEscape don't need to be processed any further.
+    // with Knex and that its valuesToEscape don't need to be processed any further.
     var meta = inputs.meta || {};
     meta.isUsingQuestionMarks = true;