Merge pull request #55 from js-data/develop

Merge branch 'develop' into master

Author: techniq

src/index.js

@@ -159,27 +159,33 @@ function loadWithRelations (items, resourceConfig, options) {
       })
     } else if (def.type === 'belongsTo' || (def.type === 'hasOne' && def.localKey)) {
       if (instance) {
-        task = this.find(resourceConfig.getResource(relationName), DSUtils.get(instance, def.localKey), __options).then(relatedItem => {
-          instance[def.localField] = relatedItem
-          return relatedItem
-        })
+        let id = DSUtils.get(instance, def.localKey)
+        if (id) {
+          task = this.find(resourceConfig.getResource(relationName), DSUtils.get(instance, def.localKey), __options).then(relatedItem => {
+            instance[def.localField] = relatedItem
+            return relatedItem
+          })
+        }
       } else {
-        task = this.findAll(resourceConfig.getResource(relationName), {
-          where: {
-            [relationDef.idAttribute]: {
-              'in': DSUtils.filter(items.map(function (item) { return DSUtils.get(item, def.localKey) }), x => x)
-            }
-          }
-        }, __options).then(relatedItems => {
-          DSUtils.forEach(items, item => {
-            DSUtils.forEach(relatedItems, relatedItem => {
-              if (relatedItem[relationDef.idAttribute] === item[def.localKey]) {
-                item[def.localField] = relatedItem
+        let ids = DSUtils.filter(items.map(function (item) { return DSUtils.get(item, def.localKey) }), x => x)
+        if (ids.length) {
+          task = this.findAll(resourceConfig.getResource(relationName), {
+            where: {
+              [relationDef.idAttribute]: {
+                'in': ids
               }
+            }
+          }, __options).then(relatedItems => {
+            DSUtils.forEach(items, item => {
+              DSUtils.forEach(relatedItems, relatedItem => {
+                if (relatedItem[relationDef.idAttribute] === item[def.localKey]) {
+                  item[def.localField] = relatedItem
+                }
+              })
             })
+            return relatedItems
           })
-          return relatedItems
-        })
+        }
       }
     }
 
@@ -404,6 +410,8 @@ class DSSqlAdapter {
             }
           } else if (op === 'like') {
             query = query.where(field, 'like', v)
+          } else if (op === '|like') {
+            query = query.orWhere(field, 'like', v)
           } else if (op === '|==' || op === '|===') {
             if (v === null) {
               query = query.orWhereNull(field)

test/findAll.spec.js

@@ -21,6 +21,31 @@ describe('DSSqlAdapter#findAll', function () {
     assert.equal(users[0].profileId, profile1.id);
   });
 
+  it('should filter using the "like" operator', function* () {
+    let user1 = yield adapter.create(User, {name: 'Sean'});
+    let post1 = yield adapter.create(Post, {userId: user1.id, content: 'foo'});
+    let post2 = yield adapter.create(Post, {userId: user1.id, content: 'bar'});
+    let post3 = yield adapter.create(Post, {userId: user1.id, content: 'baz'});
+
+    let posts = yield adapter.findAll(Post, {where: {'content': {'like': 'ba%'}}});
+    assert.equal(posts.length, 2);
+    assert.equal(posts[0].content, 'bar');
+    assert.equal(posts[1].content, 'baz');
+  });
+
+  it('should filter using the "or like" operator', function* () {
+    let user1 = yield adapter.create(User, {name: 'Sean'});
+    let post1 = yield adapter.create(Post, {userId: user1.id, content: 'foo'});
+    let post2 = yield adapter.create(Post, {userId: user1.id, content: 'bar'});
+    let post3 = yield adapter.create(Post, {userId: user1.id, content: 'baz'});
+
+    let posts = yield adapter.findAll(Post, {where: {'content': {'like': 'ba%', '|like': 'f%'}}});
+    assert.equal(posts.length, 3);
+    assert.equal(posts[0].content, 'foo');
+    assert.equal(posts[1].content, 'bar');
+    assert.equal(posts[2].content, 'baz');
+  });
+
   describe('near', function () {
     beforeEach(function * () {
       this.googleAddress    = yield adapter.create(Address, { name : 'Google',    latitude: 37.4219999, longitude: -122.0862515 });