kylefang/deployd
1
0
Fork 0
mirror of https://github.com/zhigang1992/deployd.git synced 2026-05-13 04:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed incorrect query for updates

Browse Source
This commit is contained in:
Ritchie Martori
2012-06-19 17:43:26 -07:00
parent b5c662444d
commit ed4e1a9fcf
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/db.js
View File

@@ -351,6 +351,8 @@ Store.prototype.update = function (query, object, fn) {
if(typeof query != 'object') throw new Error('update requires a query object or string id');
if(query.id) store.identify(query);
stripFields(query);
collection(this, function (err, col) {
col.update(query, object, function(err) {
store.identify(query);

12
lib/resources/collection.js
View File

@@ -385,10 +385,6 @@ Collection.prototype.save = function (session, item, query, client, fn) {
collection.execListener('Validate', session, query, item, client, function (err, item) {
if(err) return fn(err);
var errors = collection.validate(item, !query.id);
if(errors) return fn({errors: errors});
if(query.id) {
// is PUT
store.first({id: query.id, $fields: query.$fields}, function(err, obj) {
@@ -397,6 +393,10 @@ Collection.prototype.save = function (session, item, query, client, fn) {
obj[key] = item[key];
});
var errors = collection.validate(item);
if(errors) return fn({errors: errors});
collection.execListener('Put', session, query, item, client, function (err, item) {
if(err) {
err.message = 'Error while executing PUT event: ' + err.message;
@@ -413,6 +413,10 @@ Collection.prototype.save = function (session, item, query, client, fn) {
});
} else {
// is POST
var errors = collection.validate(item, true);
if(errors) return fn({errors: errors});
// generate id before event listener
item.id = store.createUniqueIdentifier();