From cca1cbb3f8655dfc7c91392f87ebfd8b92e7014c Mon Sep 17 00:00:00 2001 From: Anatoliy Chakkaev Date: Thu, 20 Sep 2012 16:02:48 +0400 Subject: [PATCH] Not strict equal when matching ids in embedded lists --- README.md | 2 +- lib/adapters/redis2.js | 4 ++-- lib/list.js | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dc1b0258..33ca1e0f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Feel free to vote and comment on cards (tickets/issues), if you want to join tea ```javascript var Schema = require('./jugglingdb').Schema; -var schema = new Schema('redis', {port: 6379}); //port number depends on your configuration +var schema = new Schema('redis2', {port: 6379}); //port number depends on your configuration // define models var Post = schema.define('Post', { title: { type: String, length: 255 }, diff --git a/lib/adapters/redis2.js b/lib/adapters/redis2.js index 7e1571f6..f76ec516 100644 --- a/lib/adapters/redis2.js +++ b/lib/adapters/redis2.js @@ -427,8 +427,8 @@ BridgeToRedis.prototype.all = function all(model, filter, callback) { // LIMIT if (filter.limit){ - var from = (filter.offset || 0), to = from + filter.limit; - sortCmd.push("LIMIT", from, to); + var offset = (filter.offset || 0), limit = filter.limit; + sortCmd.push("LIMIT", offset, limit); } // we need ALPHA modifier when sorting string values diff --git a/lib/list.js b/lib/list.js index 17a367ff..c6c95b26 100644 --- a/lib/list.js +++ b/lib/list.js @@ -130,10 +130,14 @@ List.prototype.push = function (obj) { List.prototype.remove = function (obj) { var id = obj.id ? obj.id : obj; - console.log(id); var found = false; this.items.forEach(function (o, i) { - if (o.id === id) found = i; + if (id && o.id == id) { + found = i; + if (o.id !== id) { + console.log('WARNING! Type of id not matched'); + } + } }); if (found !== false) { delete this[id];