Merge pull request #69 from treelinehq/deep-fix

Deep fix
sailshq · Feb 17, 2017 · 69cd8ff · 69cd8ff
2 parents e8ace37 + 87c3963
commit 69cd8ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/joins/query-cache.js b/lib/joins/query-cache.js
@@ -88,6 +88,7 @@ module.exports = function queryCache() {
         parentPkAttr: val.parentPkAttr,
         records: val.records || [],
         keyName: val.keyName,
+        type: val.type,
         belongsToPkValue: val.belongsToPkValue,
 
         // Optional (only used if implementing a HAS_FK strategy)
@@ -218,6 +219,11 @@ module.exports = function queryCache() {
         } else {
           matchingParentRecord[cache.keyName] = [];
         }
+
+        // Check if the value should be an array or dictionary
+        if (_.has(cache, 'type') && cache.type === 1) {
+          matchingParentRecord[cache.keyName] = _.first(cache.records) || {};
+        }
       }
     });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "waterline-utils",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "Various utilities for working with Waterline queries and adapters.",
   "scripts": {
     "test": "node ./node_modules/mocha/bin/mocha test/unit --recursive",