diff --git a/package.json b/package.json index 343fe11..1ccbcff 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dependencies": { "lodash": "3.5.0", "mysql": "2.6.2", - "sails-mysql": "git+https://github.com/postmanlabs/sails-mysql.git#v0.10.12-postman.3" + "sails-mysql": "git+https://github.com/postmanlabs/sails-mysql.git#v0.10.12-postman.5" }, "devDependencies": { "expect.js": "^0.3.1", diff --git a/tests/integration/app/api/controllers/CollectionController.js b/tests/integration/app/api/controllers/CollectionController.js index 24b0da4..d76c137 100644 --- a/tests/integration/app/api/controllers/CollectionController.js +++ b/tests/integration/app/api/controllers/CollectionController.js @@ -6,6 +6,19 @@ */ module.exports = { - + retrieve: function (req, res) { + Collection.findOne({ + select: ['name'], + where: {id: req.param('id')} + }) + .populate('user', {select: ['name']}) + .populate('requests', {select: ['name', 'collection', 'id']}) + .exec(function (err, collection) { + if (err) { + return res.serverError(err); + } + res.json(collection); + }); + }, }; diff --git a/waterline b/waterline index 96d457f..8146800 160000 --- a/waterline +++ b/waterline @@ -1 +1 @@ -Subproject commit 96d457f7a51e3fc95b8f03ada880fbe07e819c5b +Subproject commit 81468000ac72af3ac3a841b404a0ad2d120ec1d8