diff --git a/README.md b/README.md index fc259c8..00ae9c7 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ machinepack-mysql -### [Docs](http://node-machine.org/machinepack-mysql)   [Browse other machines](http://node-machine.org/machinepacks)   [FAQ](http://node-machine.org/implementing/FAQ)   [Newsgroup](https://groups.google.com/forum/?hl=en#!forum/node-machine) +Structured Node.js bindings for MySQL. -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) @@ -14,16 +14,35 @@ Structured Node.js bindings for MySql. $ npm install machinepack-mysql ``` + ## Usage -For the latest usage documentation, version information, and test status of this module, see http://node-machine.org/machinepack-mysql. The generated manpages for each machine contain a complete reference of all expected inputs, possible exit states, and example return values. If you need more help, or find a bug, jump into [Gitter](https://gitter.im/node-machine/general) or leave a message in the project [newsgroup](https://groups.google.com/forum/?hl=en#!forum/node-machine). +For the latest usage documentation, version information, and test status of this module, see http://node-machine.org/machinepack-mysql. The generated manpages for each machine contain a complete reference of all expected inputs, possible exit states, and example return values. + + +## Help + +For more examples, or if you get stuck or have questions, click [here](http://sailsjs.com/support). + + +## Bugs   [![NPM version](https://badge.fury.io/js/machinepack-mysql.svg)](http://npmjs.com/package/machinepack-mysql) + +To report a bug, [click here](http://sailsjs.com/bugs). -## About   [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/node-machine/general?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -This is a [machinepack](http://node-machine.org/machinepacks), an NPM module which exposes a set of related Node.js [machines](http://node-machine.org/spec/machine) according to the [machinepack specification](http://node-machine.org/spec/machinepack). -Documentation pages for the machines contained in this module (as well as all other NPM-hosted machines for Node.js) are automatically generated and kept up-to-date on the public registry. -Learn more at http://node-machine.org/implementing/FAQ. +## Contributing   [![Build Status](https://travis-ci.org/balderdashy/machinepack-mysql.svg?branch=master)](https://travis-ci.org/balderdashy/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. + +[![NPM](https://nodei.co/npm/machinepack-mysql.png?downloads=true)](http://npmjs.com/package/machinepack-mysql) + +## Acknowledgements + +Thanks to [felixge](https://github.com/felixge) and [dougwilson](https://github.com/dougwilson) for all of their great work on [mysql](http://npmjs.com/package/mysql). ## License -MIT © 2015 - 2016 Cody Stoltman, Mike McNeil, Scott Gress +MIT © 2015-2017 The Sails Company + +This package, like the [Sails framework](http://sailsjs.com), is free and open-source under the [MIT License](http://sailsjs.com/license). + diff --git a/helpers/validate-connection.js b/helpers/validate-connection.js index 5fe0431..1932a91 100644 --- a/helpers/validate-connection.js +++ b/helpers/validate-connection.js @@ -38,7 +38,7 @@ module.exports = require('machine').build({ fn: function validateConnection(inputs, exits) { - var _ = require('lodash'); + var _ = require('@sailshq/lodash'); // Validate some basic assertions about the provided connection. // (this doesn't guarantee it's still active or anything, but it does let diff --git a/index.js b/index.js index ea5a91d..c38106d 100644 --- a/index.js +++ b/index.js @@ -3,3 +3,10 @@ module.exports = require('machine').pack({ pkg: require('./package.json'), dir: __dirname }); + + + +//... well except for this. +// Also give the driver a `mysql` property, so that it provides access +// to the `mysql` library for Node.js. (See http://npmjs.com/package/mysql) +module.exports.mysql = require('mysql'); diff --git a/machines/create-manager.js b/machines/create-manager.js index 2640f9d..505656f 100644 --- a/machines/create-manager.js +++ b/machines/create-manager.js @@ -1,7 +1,7 @@ // Dependencies var util = require('util'); var Url = require('url'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var felix = require('mysql'); module.exports = { diff --git a/machines/parse-native-query-error.js b/machines/parse-native-query-error.js index 2cd72bb..4e19177 100644 --- a/machines/parse-native-query-error.js +++ b/machines/parse-native-query-error.js @@ -1,5 +1,5 @@ // Dependencies -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); module.exports = { diff --git a/machines/parse-native-query-result.js b/machines/parse-native-query-result.js index 177448c..9554461 100644 --- a/machines/parse-native-query-result.js +++ b/machines/parse-native-query-result.js @@ -1,5 +1,5 @@ // Dependencies -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); module.exports = { diff --git a/machines/send-native-query.js b/machines/send-native-query.js index 3a008ff..ca0314b 100644 --- a/machines/send-native-query.js +++ b/machines/send-native-query.js @@ -1,6 +1,6 @@ // Dependencies var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var debug = require('debug')('query'); module.exports = { diff --git a/package.json b/package.json index 2d54885..10e3684 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "test": "node ./node_modules/mocha/bin/mocha --recursive", "fasttest": "node ./node_modules/mocha/bin/mocha --recursive", "pretest": "npm run lint", - "lint": "eslint machines test", + "lint": "node ./node_modules/eslint/bin/eslint *.js **/*.js", "docker": "docker-compose run adapter bash" }, "keywords": [ @@ -17,11 +17,11 @@ "machines", "machinepack" ], - "author": "The Treeline Company", + "author": "The Sails Company", "license": "MIT", "dependencies": { "debug": "2.2.0", - "lodash": "3.10.1", + "@sailshq/lodash": "^3.10.2", "machine": "^13.0.0-17", "mysql": "2.10.2", "waterline-sql-builder": "^1.0.0-2" diff --git a/test/queryable/parse-native-query-error.js b/test/queryable/parse-native-query-error.js index bb7fd3e..473854a 100644 --- a/test/queryable/parse-native-query-error.js +++ b/test/queryable/parse-native-query-error.js @@ -1,5 +1,5 @@ var assert = require('assert'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var Pack = require('../../'); describe('Queryable ::', function() { diff --git a/test/queryable/parse-native-query-result.js b/test/queryable/parse-native-query-result.js index a82ae51..6b9e517 100644 --- a/test/queryable/parse-native-query-result.js +++ b/test/queryable/parse-native-query-result.js @@ -1,5 +1,5 @@ var assert = require('assert'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var Pack = require('../../'); describe('Queryable ::', function() { diff --git a/test/queryable/send-native-query.js b/test/queryable/send-native-query.js index ee1bb84..e25f3b1 100644 --- a/test/queryable/send-native-query.js +++ b/test/queryable/send-native-query.js @@ -1,5 +1,5 @@ var assert = require('assert'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var Pack = require('../../'); describe('Queryable ::', function() {