verdnatura-mirror
/
loopback-datasource-juggler
mirror of https://github.com/loopbackio/loopback-datasource-juggler
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #618 from strongloop/feature/fix-lb-967 

Allow 0 as the FK
This commit is contained in:
Raymond Feng 2015-06-16 08:55:54 -07:00
parent bbe9cb350c 3ee3ba3dcf
commit ef50be563f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/relation-definition.js
View File

@ -783,7 +783,7 @@ HasMany.prototype.findById = function (fkId, options, cb) {
return cb(err);
}
// Check if the foreign key matches the primary key
if (inst[fk] && inst[fk].toString() === modelInstance[pk].toString()) {
if (inst[fk] != null && inst[fk].toString() === modelInstance[pk].toString()) {
cb(null, inst);
} else {
err = new Error('Key mismatch: ' + modelFrom.modelName + '.' + pk
@ -1483,7 +1483,7 @@ BelongsTo.prototype.related = function (condOrRefresh, options, cb) {
return cb(null, null);
}
// Check if the foreign key matches the primary key
if (inst[pk] && modelInstance[fk]
if (inst[pk] != null && modelInstance[fk] != null
&& inst[pk].toString() === modelInstance[fk].toString()) {
self.resetCache(inst);
cb(null, inst);
@ -1891,7 +1891,7 @@ HasOne.prototype.related = function (condOrRefresh, options, cb) {
return cb(null, null);
}
// Check if the foreign key matches the primary key
if (inst[fk] && modelInstance[pk]
if (inst[fk] != null && modelInstance[pk] != null
&& inst[fk].toString() === modelInstance[pk].toString()) {
self.resetCache(inst);
cb(null, inst);
@ -3005,7 +3005,10 @@ ReferencesMany.prototype.findById = function (fkId, options, cb) {
}
var currentIds = ids.map(function(id) { return id.toString(); });
var id = (inst[pk] || '').toString(); // mongodb
var id = '';
if (inst[pk] != null) {
id = inst[pk].toString();
}
// Check if the foreign key is amongst the ids
if (currentIds.indexOf(id) > -1) {