From 05eae4aa3ec522a5a241cb8d36d68806c7d70aa4 Mon Sep 17 00:00:00 2001 From: Raymond Feng Date: Mon, 18 Nov 2013 11:39:07 -0800 Subject: [PATCH] Replace all with find to make it consistent --- examples/relations.js | 11 ++++++++--- lib/include.js | 2 +- lib/relations.js | 2 +- lib/scope.js | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/examples/relations.js b/examples/relations.js index 8501f4ea..3a717dfe 100644 --- a/examples/relations.js +++ b/examples/relations.js @@ -30,9 +30,14 @@ Customer.hasMany(Order, {as: 'orders', foreignKey: 'customerId'}); Customer.create({name: 'Ray'}, function (err, customer) { Order.create({customerId: customer.id, orderDate: new Date()}, function (err, order) { customer.orders(console.log); - customer.orders.create({orderDate: new Date()}, console.log); - customer.orders.findById('2', console.log); - customer.orders.destroy('2', console.log); + customer.orders.create({orderDate: new Date()}, function(err, order) { + console.log(order); + Customer.include([customer], 'orders', function(err, results) { + console.log('Results: ', results); + }); + customer.orders.findById('2', console.log); + customer.orders.destroy('2', console.log); + }); }); }); diff --git a/lib/include.js b/lib/include.js index 39573ba3..57f8ee9f 100644 --- a/lib/include.js +++ b/lib/include.js @@ -119,7 +119,7 @@ Inclusion.include = function (objects, include, cb) { req['include'] = subInclude; return function(cb) { - relation.modelTo.all(req, function(err, objsIncluded) { + relation.modelTo.find(req, function(err, objsIncluded) { for (var i = 0; i < objsIncluded.length; i++) { delete keysToBeProcessed[objsIncluded[i][relation.keyTo]]; var objectsFrom = objsByKeys[relation.keyFrom][objsIncluded[i][relation.keyTo]]; diff --git a/lib/relations.js b/lib/relations.js index e5b8b317..7cf2aaa9 100644 --- a/lib/relations.js +++ b/lib/relations.js @@ -55,7 +55,7 @@ Relation.hasMany = function hasMany(anotherClass, params) { }; // each instance of this class should have method named // pluralize(anotherClass.modelName) - // which is actually just anotherClass.all({where: {thisModelNameId: this[idName]}}, cb); + // which is actually just anotherClass.find({where: {thisModelNameId: this[idName]}}, cb); var scopeMethods = { findById: find, destroy: destroy diff --git a/lib/scope.js b/lib/scope.js index e65f748a..e4672d5d 100644 --- a/lib/scope.js +++ b/lib/scope.js @@ -139,7 +139,7 @@ function defineScope(cls, targetClass, name, params, methods) { - If fetching the Elements on which destroyAll is called results in an error */ function destroyAll(cb) { - targetClass.all(this._scope, function (err, data) { + targetClass.find(this._scope, function (err, data) { if (err) { cb(err); } else {