Stable Version 0.11.8

js-data · Jan 19, 2016 · c55e292 · c55e292
1 parent f4352e7
commit c55e292
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/dist/js-data-sql.js b/dist/js-data-sql.js
@@ -232,29 +232,35 @@ module.exports =
 	      })();
 	    } 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(function (relatedItem) {
-	          instance[def.localField] = relatedItem;
-	          return relatedItem;
-	        });
+	        var id = DSUtils.get(instance, def.localKey);
+	        if (id) {
+	          task = _this.find(resourceConfig.getResource(relationName), DSUtils.get(instance, def.localKey), __options).then(function (relatedItem) {
+	            instance[def.localField] = relatedItem;
+	            return relatedItem;
+	          });
+	        }
 	      } else {
-	        task = _this.findAll(resourceConfig.getResource(relationName), {
-	          where: _defineProperty({}, relationDef.idAttribute, {
-	            'in': DSUtils.filter(items.map(function (item) {
-	              return DSUtils.get(item, def.localKey);
-	            }), function (x) {
-	              return x;
+	        var ids = DSUtils.filter(items.map(function (item) {
+	          return DSUtils.get(item, def.localKey);
+	        }), function (x) {
+	          return x;
+	        });
+	        if (ids.length) {
+	          task = _this.findAll(resourceConfig.getResource(relationName), {
+	            where: _defineProperty({}, relationDef.idAttribute, {
+	              'in': ids
 	            })
-	          })
-	        }, __options).then(function (relatedItems) {
-	          DSUtils.forEach(items, function (item) {
-	            DSUtils.forEach(relatedItems, function (relatedItem) {
-	              if (relatedItem[relationDef.idAttribute] === item[def.localKey]) {
-	                item[def.localField] = relatedItem;
-	              }
+	          }, __options).then(function (relatedItems) {
+	            DSUtils.forEach(items, function (item) {
+	              DSUtils.forEach(relatedItems, function (relatedItem) {
+	                if (relatedItem[relationDef.idAttribute] === item[def.localKey]) {
+	                  item[def.localField] = relatedItem;
+	                }
+	              });
 	            });
+	            return relatedItems;
 	          });
-	          return relatedItems;
-	        });
+	        }
 	      }
 	    }
 
@@ -503,6 +509,8 @@ module.exports =
 	                }
 	              } 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);

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-sql",
   "description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.",
-  "version": "0.11.7",
+  "version": "0.11.8",
   "homepage": "http://www.js-data.io/docs/dssqladapter",
   "repository": {
     "type": "git",