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 0d0503c commit 075d759
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 22 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
3 changes: 1 addition & 2 deletions helpers/avg.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ module.exports = require('machine').build({

success: {
description: 'The results of the avg query.',
outputVariableName: 'records',
example: '==='
outputType: 'ref'
},

invalidDatastore: {
Expand Down
3 changes: 1 addition & 2 deletions helpers/count.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ module.exports = require('machine').build({

success: {
description: 'The results of the count query.',
outputVariableName: 'records',
example: '==='
outputExample: '==='
},

invalidDatastore: {
Expand Down
4 changes: 2 additions & 2 deletions helpers/create-each.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module.exports = require('machine').build({
success: {
description: 'The record was successfully inserted.',
outputVariableName: 'record',
example: '==='
outputExample: '==='
},

invalidDatastore: {
Expand All @@ -66,7 +66,7 @@ module.exports = require('machine').build({

notUnique: {
friendlyName: 'Not Unique',
example: '==='
outputExample: '==='
}

},
Expand Down
4 changes: 2 additions & 2 deletions helpers/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = require('machine').build({
success: {
description: 'The record was successfully inserted.',
outputVariableName: 'record',
example: '==='
outputType: 'ref'
},

invalidDatastore: {
Expand All @@ -59,7 +59,7 @@ module.exports = require('machine').build({

notUnique: {
friendlyName: 'Not Unique',
example: '==='
outputType: 'ref'
}

},
Expand Down
2 changes: 1 addition & 1 deletion helpers/describe.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = require('machine').build({
success: {
description: 'The results of the describe query.',
outputVariableName: 'records',
example: '==='
outputType: 'ref'
},

badConnection: {
Expand Down
3 changes: 1 addition & 2 deletions helpers/destroy.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ module.exports = require('machine').build({

success: {
description: 'The results of the destroy query.',
outputVariableName: 'records',
example: '==='
outputType: 'ref'
},

invalidDatastore: {
Expand Down
2 changes: 1 addition & 1 deletion helpers/join.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = require('machine').build({

success: {
description: 'The query was run successfully.',
example: '==='
outputType: 'ref'
},

badConnection: {
Expand Down
5 changes: 1 addition & 4 deletions helpers/register-data-store.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ module.exports = require('machine').build({
description: 'Register a new datastore for making connections.',


cacheable: false,


sync: true,


Expand Down Expand Up @@ -71,7 +68,7 @@ module.exports = require('machine').build({

badConfiguration: {
description: 'The configuration was invalid.',
outputExample: '==='
outputType: 'ref'
}

},
Expand Down
2 changes: 1 addition & 1 deletion helpers/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = require('machine').build({
success: {
description: 'The results of the select query.',
outputVariableName: 'records',
example: '==='
outputType: 'ref'
},

invalidDatastore: {
Expand Down
3 changes: 1 addition & 2 deletions helpers/sum.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ module.exports = require('machine').build({

success: {
description: 'The results of the sum query.',
outputVariableName: 'records',
example: '==='
outputType: 'ref'
},

invalidDatastore: {
Expand Down
4 changes: 2 additions & 2 deletions helpers/update.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = require('machine').build({
success: {
description: 'The records were successfully updated.',
outputVariableName: 'records',
example: '==='
outputType: 'ref'
},

invalidDatastore: {
Expand All @@ -59,7 +59,7 @@ module.exports = require('machine').build({

notUnique: {
friendlyName: 'Not Unique',
example: '==='
outputType: 'ref'
}

},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dependencies": {
"@sailshq/lodash": "^3.10.2",
"async": "2.0.1",
"machine": "^13.0.0-17",
"machine": "^15.0.0-21",
"machinepack-mysql": "^2.0.0-4",
"waterline-utils": "^1.3.10"
},
Expand Down

0 comments on commit 075d759

Please sign in to comment.