Merge pull request #28 from postmanlabs/feature/selective_populate_one

Fix for issue with one-to-many joins having select criteria.

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",

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);
+    });
+  },
 };