Merge pull request #357 from fabien/fix/rel-multiple

Set RelationDefinition multiple flag
This commit is contained in:
Raymond Feng 2014-12-01 11:33:28 -08:00
commit 5255afe9b2
1 changed files with 3 additions and 1 deletions

View File

@ -114,7 +114,7 @@ function RelationDefinition(definition) {
} }
this.modelThrough = definition.modelThrough; this.modelThrough = definition.modelThrough;
this.keyThrough = definition.keyThrough; this.keyThrough = definition.keyThrough;
this.multiple = (this.type !== 'belongsTo' && this.type !== 'hasOne'); this.multiple = definition.multiple;
this.properties = definition.properties || {}; this.properties = definition.properties || {};
this.options = definition.options || {}; this.options = definition.options || {};
this.scope = definition.scope; this.scope = definition.scope;
@ -1139,6 +1139,7 @@ RelationDefinition.belongsTo = function (modelFrom, modelTo, params) {
keyFrom: fk, keyFrom: fk,
keyTo: idName, keyTo: idName,
modelTo: modelTo, modelTo: modelTo,
multiple: false,
properties: params.properties, properties: params.properties,
scope: params.scope, scope: params.scope,
options: params.options, options: params.options,
@ -1447,6 +1448,7 @@ RelationDefinition.hasOne = function (modelFrom, modelTo, params) {
keyFrom: pk, keyFrom: pk,
keyTo: fk, keyTo: fk,
modelTo: modelTo, modelTo: modelTo,
multiple: false,
properties: params.properties, properties: params.properties,
scope: params.scope, scope: params.scope,
options: params.options, options: params.options,