Code cleanup in lib/dao.js
Rename callback argument "result" to "info" to make it consistent with other places where we use "info" too. Remove traling whitespace.
This commit is contained in:
parent
1461400f72
commit
3a51510119
|
@ -410,7 +410,7 @@ DataAccessObject.updateOrCreate = DataAccessObject.upsert = function upsert(data
|
||||||
self.getDataSource().connector
|
self.getDataSource().connector
|
||||||
.updateOrCreate(Model.modelName, update, done);
|
.updateOrCreate(Model.modelName, update, done);
|
||||||
|
|
||||||
function done(err, data, result) {
|
function done(err, data, info) {
|
||||||
var obj;
|
var obj;
|
||||||
if (data && !(data instanceof Model)) {
|
if (data && !(data instanceof Model)) {
|
||||||
inst._initProperties(data, { persisted: true });
|
inst._initProperties(data, { persisted: true });
|
||||||
|
@ -427,7 +427,7 @@ DataAccessObject.updateOrCreate = DataAccessObject.upsert = function upsert(data
|
||||||
var context = {
|
var context = {
|
||||||
Model: Model,
|
Model: Model,
|
||||||
instance: obj,
|
instance: obj,
|
||||||
isNewInstance: result ? result.isNewInstance : undefined,
|
isNewInstance: info ? info.isNewInstance : undefined,
|
||||||
hookState: hookState,
|
hookState: hookState,
|
||||||
options: options
|
options: options
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue