Skip to content
This repository was archived by the owner on Apr 11, 2023. It is now read-only.

Recursive Complex Types #290

Open
jpattersonz wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Recursive Complex Types #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
deal with recursive data types in the model binder config compiler an… 
…d query builder
  • Loading branch information
@jpattersonz
jpattersonz committed Apr 17, 2017
commit 280ffdcc1f5a1a41b1936cc1603873fd1b7757ca
5 changes: 4 additions & 1 deletion src/Types/QueryBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ $C('$data.queryBuilder', null, null, {
this.modelBinderConfig['$keys'] = new Array();
}
this.modelBinderConfig['$keys'].push(name);
}
},
stackContainsType: function(elementType) {
return this._binderConfigPropertyStack.map(p => p.$type).indexOf(elementType) >= 0;
},
});

export default $data
3 changes: 3 additions & 0 deletions src/Types/StorageProviders/modelBinderConfigCompiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ $C('$data.modelBinder.ModelBinderConfigCompiler', $data.Expressions.EntityExpres
_addPropertyToModelBinderConfig: function (elementType, builder) {
var storageModel = this._query.context._storageModel.getStorageModel(elementType);
if (elementType.memberDefinitions) {
if (builder.stackContainsType(elementType)) {
return;
}
var memberDefinitions = this._inheritanceMemberDefinitions(elementType, elementType.memberDefinitions.getPublicMappedProperties());
memberDefinitions.forEach(function (prop) {
if ((!storageModel) || (storageModel && !storageModel.Associations[prop.name] && !storageModel.ComplexTypes[prop.name])) {
Expand Down