Skip to content

Commit

Permalink
Update machine runner to v15. (refs balderdashy/sails#4264)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikermcneil committed Dec 19, 2017
1 parent 7dc16ac commit d9d31aa
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 44 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
node_modules
npm-debug.log
.node_history
package-lock.json

############################
# editor & OS files
Expand Down
2 changes: 1 addition & 1 deletion helpers/validate-connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = require('machine').build({
description: 'Check if this looks like a valid MySQL connection instance.',


cacheable: true,
sideEffects: 'cacheable',


sync: true,
Expand Down
1 change: 0 additions & 1 deletion machines/.gitkeep

This file was deleted.

8 changes: 4 additions & 4 deletions machines/begin-transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ module.exports = {
extendedDescription: 'Until it is committed, rolled back, or times out, subsequent queries run on this connection will be transactional. They will not have any true effect on the database until the transaction is committed, and will not affect queries made on other connections.',
outputVariableName: 'report',
outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// meta: '==='
// }
},
Expand All @@ -49,8 +49,8 @@ module.exports = {
extendedDescription: 'Usually, this means the connection to the database was lost due to a logic error or timing issue in userland code. In production, this can mean that the database became overwhelemed or was shut off while some business logic was in progress.',
outputVariableName: 'report',
outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// meta: '==='
// }
}
Expand Down
8 changes: 4 additions & 4 deletions machines/commit-transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ module.exports = {
extendedDescription: 'Subsequent queries on this connection will no longer be transactional unless a new transaction is begun.',
outputVariableName: 'report',
outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// meta: '==='
// }
},
Expand All @@ -52,8 +52,8 @@ module.exports = {
extendedDescription: 'Usually, this means the connection to the database was lost due to a logic error or timing issue in userland code. In production, this can mean that the database became overwhelemed or was shut off while some business logic was in progress.',
outputVariableName: 'report',
outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// meta: '==='
// }
}
Expand Down
8 changes: 4 additions & 4 deletions machines/compile-statement.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
description: 'Compile a Waterline statement to a native query for MySQL.',


cacheable: true,
sideEffects: 'cacheable',


sync: true,
Expand Down Expand Up @@ -46,7 +46,7 @@ module.exports = {
description: 'The provided Waterline statement was compiled successfully.',
outputVariableName: 'report',
outputDescription: 'The `nativeQuery` property is the compiled native query for the database. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// nativeQuery: 'SELECT * FROM foo',
// valuesToEscape: ['foo']
Expand All @@ -58,7 +58,7 @@ module.exports = {
description: 'The provided Waterline statement could not be compiled due to malformed syntax.',
outputVariableName: 'report',
outputDescription: 'The `error` property is a JavaScript error instance explaining that (or preferably even _why_) the Waterline syntax is not valid. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// error: '===',
// meta: '==='
Expand All @@ -70,7 +70,7 @@ module.exports = {
extendedDescription: 'If even one clause of the Waterline statement is not supported by the MySQL driver, the compilation of the entire statement _always fails_.',
outputVariableName: 'report',
outputDescription: 'The `error` property is a JavaScript error instance explaining that (or preferably even _why_) the Waterline statement is not supported. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// error: '===',
// meta: '==='
Expand Down
11 changes: 4 additions & 7 deletions machines/create-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ module.exports = {
'(e.g. a PoolCluster from felixge\'s `mysql` package).',


cacheable: false,


sync: true,


Expand Down Expand Up @@ -82,7 +79,7 @@ module.exports = {
'basis; and it may also vary based on the configuration passed into the `meta` input.',
outputVariableName: 'report',
outputDescription: 'The `manager` property is a manager instance that will be passed into `getConnection()`. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// manager: '===',
// meta: '==='
Expand All @@ -93,7 +90,7 @@ module.exports = {
description: 'The provided connection string is not valid for MySQL.',
outputVariableName: 'report',
outputDescription: 'The `error` property is a JavaScript Error instance explaining that (and preferably "why") the provided connection string is invalid. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// error: '===',
// meta: '==='
Expand All @@ -119,8 +116,8 @@ module.exports = {
'any errors related to bad credentials, connectivity, etc. will not be caught until `getConnection()` is called.',
outputVariableName: 'report',
outputDescription: 'The `error` property is a JavaScript Error instance with more information and a stack trace. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// error: '===',
// meta: '==='
// }
Expand Down
4 changes: 2 additions & 2 deletions machines/destroy-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = {
description: 'The specified manager and all of its active connections were successfully destroyed.',
outputVariableName: 'report',
outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// meta: '==='
// }
Expand All @@ -48,7 +48,7 @@ module.exports = {
'server(s) became overwhelemed or were shut off while some business logic was in progress.',
outputVariableName: 'report',
outputDescription: 'The `error` property is a JavaScript Error instance with more information and a stack trace. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// error: '===',
// meta: '==='
Expand Down
4 changes: 2 additions & 2 deletions machines/get-connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ module.exports = {
extendedDescription: 'This connection should be eventually released. Otherwise, it may time out. It is not a good idea to rely on database connections timing out-- be sure to release this connection when finished with it!',
outputVariableName: 'report',
outputDescription: 'The `connection` property is an active connection to the database. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// connection: '===',
// meta: '==='
Expand All @@ -57,7 +57,7 @@ module.exports = {
' + any other miscellaneous connection error',
outputVariableName: 'report',
outputDescription: 'The `error` property is a JavaScript Error instance explaining that a connection could not be made. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// error: '===',
// meta: '==='
Expand Down
4 changes: 2 additions & 2 deletions machines/parse-native-query-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
moreInfoUrl: 'https://github.com/node-machine/waterline-driver-interface#footprints',


cacheable: true,
sideEffects: 'cacheable',


sync: true,
Expand Down Expand Up @@ -45,7 +45,7 @@ module.exports = {
moreInfoUrl: 'https://github.com/node-machine/waterline-driver-interface#footprints',
outputVariableName: 'report',
outputDescription: 'The `footprint` property is the normalized "footprint" representing the provided raw error. Conforms to one of a handful of standardized footprint types expected by the Waterline driver interface. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// footprint: {},
// meta: '==='
Expand Down
4 changes: 2 additions & 2 deletions machines/parse-native-query-result.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
description: 'Parse a raw result from a native query and normalize it for the specified query type.',


cacheable: true,
sideEffects: 'cacheable',


sync: true,
Expand Down Expand Up @@ -52,7 +52,7 @@ module.exports = {
description: 'The result was successfully normalized.',
outputVariableName: 'report',
outputDescription: 'The `result` property is the normalized version of the raw result originally provided. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
outputExample: '==='
// example: {
// result: '*',
// meta: '==='
Expand Down
8 changes: 4 additions & 4 deletions machines/release-connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ module.exports = {
extendedDescription: 'The provided connection may no longer be used for any subsequent queries.',
outputVariableName: 'report',
outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// meta: '==='
// }
},
Expand All @@ -46,8 +46,8 @@ module.exports = {
extendedDescription: 'Usually, this means the connection to the database was lost due to a logic error or timing issue in userland code. In production, this can mean that the database became overwhelemed or was shut off while some business logic was in progress.',
outputVariableName: 'report',
outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// meta: '==='
// }
}
Expand Down
8 changes: 4 additions & 4 deletions machines/rollback-transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ module.exports = {
extendedDescription: 'Subsequent queries on this connection will no longer be transactional unless a new transaction is begun.',
outputVariableName: 'report',
outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// meta: '==='
// }
},
Expand All @@ -50,8 +50,8 @@ module.exports = {
friendlyName: 'Meta (custom)',
description: 'Additional stuff to pass to the driver.',
extendedDescription: 'This is reserved for custom driver-specific extensions. Please refer to the documentation for the driver you are using for more specific information.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// meta: '==='
// }
}
Expand Down
12 changes: 6 additions & 6 deletions machines/send-native-query.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ module.exports = {
outputVariableName: 'report',
outputDescription: 'The `result` property is the result data the database sent back. The `meta` property is reserved for custom driver-specific extensions.',
moreInfoUrl: 'https://github.com/felixge/node-mysql#getting-the-id-of-an-inserted-row',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// result: '===',
// meta: '==='
// }
Expand All @@ -68,8 +68,8 @@ module.exports = {
description: 'The database returned an error when attempting to execute the native query.',
outputVariableName: 'report',
outputDescription: 'The `error` property is a JavaScript Error instance with more details about what went wrong. The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// error: '===',
// meta: '==='
// }
Expand All @@ -81,8 +81,8 @@ module.exports = {
extendedDescription: 'Usually, this means the connection to the database was lost due to a logic error or timing issue in userland code. In production, this can mean that the database became overwhelemed or was shut off while some business logic was in progress.',
outputVariableName: 'report',
outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
example: '==='
// example: {
outputExample: '==='
// outputExample: {
// meta: '==='
// }
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dependencies": {
"debug": "2.2.0",
"@sailshq/lodash": "^3.10.2",
"machine": "^13.0.0-17",
"machine": "^15.0.0-21",
"mysql": "2.10.2",
"waterline-sql-builder": "^1.0.0-2"
},
Expand Down

0 comments on commit d9d31aa

Please sign in to comment.