Merge pull request #2 from sdrdis/master

Added support for include key
This commit is contained in:
Anatoliy Chakkaev 2012-12-16 16:39:19 -08:00
commit 1c8194a7ce
1 changed files with 8 additions and 2 deletions

View File

@ -229,9 +229,15 @@ MySQL.prototype.all = function all(model, filter, callback) {
if (err) { if (err) {
return callback(err, []); return callback(err, []);
} }
callback(null, data.map(function (obj) {
var objs = data.map(function (obj) {
return self.fromDatabase(model, obj); return self.fromDatabase(model, obj);
})); });
if (filter && filter.include) {
this._models[model].model.include(objs, filter.include, callback);
} else {
callback(null, objs);
}
}.bind(this)); }.bind(this));
return sql; return sql;