Stable Version 0.5.1.

js-data · Jul 11, 2015 · 14557d6 · 14557d6
1 parent 3d72607
commit 14557d6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##### 0.5.1 - 10 July 2015
+
+###### Backwards compatible bug fixes
+- Fix for loading relations in find() and findAll()
+
 ##### 0.5.0 - 10 July 2015
 
 Upgraded dependencies

diff --git a/dist/js-data-mongodb.js b/dist/js-data-mongodb.js
@@ -307,11 +307,14 @@ module.exports =
 	          if (containedName) {
 	            (function () {
 	              var __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
+	              __options['with'] = options['with'].slice();
 	              __options = DSUtils._(relationDef, __options);
 	              DSUtils.remove(__options['with'], containedName);
 	              DSUtils.forEach(__options['with'], function (relation, i) {
 	                if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
 	                  __options['with'][i] = relation.substr(containedName.length + 1);
+	                } else {
+	                  __options['with'][i] = '';
 	                }
 	              });
 
@@ -402,11 +405,14 @@ module.exports =
 	          if (containedName) {
 	            (function () {
 	              var __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
+	              __options['with'] = options['with'].slice();
 	              __options = DSUtils._(relationDef, __options);
 	              DSUtils.remove(__options['with'], containedName);
 	              DSUtils.forEach(__options['with'], function (relation, i) {
 	                if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
 	                  __options['with'][i] = relation.substr(containedName.length + 1);
+	                } else {
+	                  __options['with'][i] = '';
 	                }
 	              });
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-mongodb",
   "description": "MongoDB adapter for js-data.",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "homepage": "http://www.js-data.io/docs/dsmongodbadapter",
   "repository": {
     "type": "git",

diff --git a/src/index.js b/src/index.js
@@ -245,11 +245,14 @@ class DSMongoDBAdapter {
         }
         if (containedName) {
           let __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
+          __options.with = options.with.slice();
           __options = DSUtils._(relationDef, __options);
           DSUtils.remove(__options.with, containedName);
           DSUtils.forEach(__options.with, (relation, i) => {
             if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
               __options.with[i] = relation.substr(containedName.length + 1);
+            } else {
+              __options.with[i] = '';
             }
           });
 
@@ -333,11 +336,14 @@ class DSMongoDBAdapter {
         }
         if (containedName) {
           let __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
+          __options.with = options.with.slice();
           __options = DSUtils._(relationDef, __options);
           DSUtils.remove(__options.with, containedName);
           DSUtils.forEach(__options.with, (relation, i) => {
             if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
               __options.with[i] = relation.substr(containedName.length + 1);
+            } else {
+              __options.with[i] = '';
             }
           });