Merge pull request #110 from appscot/bug-expand

When expanding results (in joins) make sure to only cache RIDs
appscot · Jun 3, 2015 · c41e67c · c41e67c
2 parents 5319453 + 488a5f5
commit c41e67c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/associations.js b/lib/associations.js
@@ -240,7 +240,7 @@ Associations.prototype.expandResults = function expandResults(resultset) {
   var clonedResults = _.cloneDeep(resultset);
 
   var recordMap = utils.reduceNestedObjects(clonedResults, function(accumulator, obj){
-      if(obj.id)
+      if(obj.id && utils.matchRecordId(obj.id))
         accumulator[obj.id] = _.cloneDeep(obj); // ugly but avoids circular references issues when converting to json
       if(obj['@rid'])
         log.warn('fetchPlanJoin: object ' + obj['@rid'] + ' still has @rid!');

diff --git a/test/unit/associations.test.js b/test/unit/associations.test.js
@@ -157,4 +157,19 @@ describe('associations class', function () {
     done();
   });
 
+  it('expandResults: should not confuse ids with rids', function(done){
+    var resultset = [
+        { id: '#5:0', name: 'Maria', picture: { id: 1 }, likes: 1 }
+      ];
+
+    var expandedResultset = [
+        { id: '#5:0', name: 'Maria', picture: { id: 1 }, likes: 1 }
+      ];
+
+    var transformed = associations.expandResults(resultset);
+    assert.deepEqual(transformed, expandedResultset);
+
+    done();
+  });
+
 });