Skip to content

Commit

Permalink
Revert "Minor bug fix: Local query inline count calculation."
Browse files Browse the repository at this point in the history 
This reverts commit 512dd63.
  • Loading branch information
@umutozel
umutozel committed Aug 21, 2014
1 parent 512dd63 commit d38031d
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 84 deletions.
Binary file modified Beetle.Client/App_Data/Test.sdf
View file
Binary file not shown.
24 changes: 9 additions & 15 deletions Beetle.Client/Scripts/beetle/beetle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8423,8 +8423,8 @@
// if option need local and server results both, after server query re-run same query on local.
if (execution == enums.executionStrategy.Both) {
newEntities = that.executeQueryLocally(query);
if (inlineCount != null && newEntities.$inlineCountDiff != null)
inlineCount += newEntities.$inlineCountDiff;
if (inlineCount)
inlineCount += newEntities.$addedCount - newEntities.$deletedCount;
}
if (newEntities) {
if (query.inlineCountEnabled && inlineCount != null)
Expand Down Expand Up @@ -8470,29 +8470,23 @@
} else
throw helper.createError(i18N.typeRequiredForLocalQueries);

var array = [], serverArray = [], modifiedClient = false;
var array = [], addedCount = 0, deletedCount = 0;
helper.forEach(entities, function (entity) {
if (entity.$tracker.entityState == enums.entityStates.Added) {
modifiedClient = true;
addedCount++;
array.push(entity);
}
else if (entity.$tracker.entityState == enums.entityStates.Deleted) {
modifiedClient = true;
serverArray.push(entity);
}
else {
else if (entity.$tracker.entityState == enums.entityStates.Deleted)
deletedCount++;
else
array.push(entity);
serverArray.push(entity);
}
});
// get array handling function for query
var func = query.toFunction();
// run function against entities
array = func(array, varContext);
if (array.$inlineCount && modifiedClient) {
var serverResult = func(serverArray, varContext);
array.$inlineCountDiff = array.$inlineCount - serverResult.$inlineCount;
}
array.$addedCount = addedCount;
array.$deletedCount = deletedCount;
return array;
};

Expand Down
2 changes: 1 addition & 1 deletion Beetle.Client/Scripts/beetle/beetle.min.js
View file

Large diffs are not rendered by default.

26 changes: 10 additions & 16 deletions Samples/Beetle.Samples.Northwind/Scripts/beetle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5447,7 +5447,7 @@
}
return false;
}
return items && items.indexOf(item) >= 0;
return items && items.indexOf(item) > 0;
};

return new ctor();
Expand Down Expand Up @@ -8423,8 +8423,8 @@
// if option need local and server results both, after server query re-run same query on local.
if (execution == enums.executionStrategy.Both) {
newEntities = that.executeQueryLocally(query);
if (inlineCount != null && newEntities.$inlineCountDiff != null)
inlineCount += newEntities.$inlineCountDiff;
if (inlineCount)
inlineCount += newEntities.$addedCount - newEntities.$deletedCount;
}
if (newEntities) {
if (query.inlineCountEnabled && inlineCount != null)
Expand Down Expand Up @@ -8470,29 +8470,23 @@
} else
throw helper.createError(i18N.typeRequiredForLocalQueries);

var array = [], serverArray = [], modifiedClient = false;
var array = [], addedCount = 0, deletedCount = 0;
helper.forEach(entities, function (entity) {
if (entity.$tracker.entityState == enums.entityStates.Added) {
modifiedClient = true;
addedCount++;
array.push(entity);
}
else if (entity.$tracker.entityState == enums.entityStates.Deleted) {
modifiedClient = true;
serverArray.push(entity);
}
else {
else if (entity.$tracker.entityState == enums.entityStates.Deleted)
deletedCount++;
else
array.push(entity);
serverArray.push(entity);
}
});
// get array handling function for query
var func = query.toFunction();
// run function against entities
array = func(array, varContext);
if (array.$inlineCount && modifiedClient) {
var serverResult = func(serverArray, varContext);
array.$inlineCountDiff = array.$inlineCount - serverResult.$inlineCount;
}
array.$addedCount = addedCount;
array.$deletedCount = deletedCount;
return array;
};

Expand Down
2 changes: 1 addition & 1 deletion Samples/Beetle.Samples.Northwind/Scripts/beetle.min.js
View file

Large diffs are not rendered by default.

26 changes: 10 additions & 16 deletions Samples/Todo/Beetle.Samples.Todo.Angular/Scripts/beetle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5447,7 +5447,7 @@
}
return false;
}
return items && items.indexOf(item) >= 0;
return items && items.indexOf(item) > 0;
};

return new ctor();
Expand Down Expand Up @@ -8423,8 +8423,8 @@
// if option need local and server results both, after server query re-run same query on local.
if (execution == enums.executionStrategy.Both) {
newEntities = that.executeQueryLocally(query);
if (inlineCount != null && newEntities.$inlineCountDiff != null)
inlineCount += newEntities.$inlineCountDiff;
if (inlineCount)
inlineCount += newEntities.$addedCount - newEntities.$deletedCount;
}
if (newEntities) {
if (query.inlineCountEnabled && inlineCount != null)
Expand Down Expand Up @@ -8470,29 +8470,23 @@
} else
throw helper.createError(i18N.typeRequiredForLocalQueries);

var array = [], serverArray = [], modifiedClient = false;
var array = [], addedCount = 0, deletedCount = 0;
helper.forEach(entities, function (entity) {
if (entity.$tracker.entityState == enums.entityStates.Added) {
modifiedClient = true;
addedCount++;
array.push(entity);
}
else if (entity.$tracker.entityState == enums.entityStates.Deleted) {
modifiedClient = true;
serverArray.push(entity);
}
else {
else if (entity.$tracker.entityState == enums.entityStates.Deleted)
deletedCount++;
else
array.push(entity);
serverArray.push(entity);
}
});
// get array handling function for query
var func = query.toFunction();
// run function against entities
array = func(array, varContext);
if (array.$inlineCount && modifiedClient) {
var serverResult = func(serverArray, varContext);
array.$inlineCountDiff = array.$inlineCount - serverResult.$inlineCount;
}
array.$addedCount = addedCount;
array.$deletedCount = deletedCount;
return array;
};

Expand Down
2 changes: 1 addition & 1 deletion Samples/Todo/Beetle.Samples.Todo.Angular/Scripts/beetle.min.js
View file

Large diffs are not rendered by default.

26 changes: 10 additions & 16 deletions Samples/Todo/Beetle.Samples.Todo.Knockout/Scripts/beetle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5447,7 +5447,7 @@
}
return false;
}
return items && items.indexOf(item) >= 0;
return items && items.indexOf(item) > 0;
};

return new ctor();
Expand Down Expand Up @@ -8423,8 +8423,8 @@
// if option need local and server results both, after server query re-run same query on local.
if (execution == enums.executionStrategy.Both) {
newEntities = that.executeQueryLocally(query);
if (inlineCount != null && newEntities.$inlineCountDiff != null)
inlineCount += newEntities.$inlineCountDiff;
if (inlineCount)
inlineCount += newEntities.$addedCount - newEntities.$deletedCount;
}
if (newEntities) {
if (query.inlineCountEnabled && inlineCount != null)
Expand Down Expand Up @@ -8470,29 +8470,23 @@
} else
throw helper.createError(i18N.typeRequiredForLocalQueries);

var array = [], serverArray = [], modifiedClient = false;
var array = [], addedCount = 0, deletedCount = 0;
helper.forEach(entities, function (entity) {
if (entity.$tracker.entityState == enums.entityStates.Added) {
modifiedClient = true;
addedCount++;
array.push(entity);
}
else if (entity.$tracker.entityState == enums.entityStates.Deleted) {
modifiedClient = true;
serverArray.push(entity);
}
else {
else if (entity.$tracker.entityState == enums.entityStates.Deleted)
deletedCount++;
else
array.push(entity);
serverArray.push(entity);
}
});
// get array handling function for query
var func = query.toFunction();
// run function against entities
array = func(array, varContext);
if (array.$inlineCount && modifiedClient) {
var serverResult = func(serverArray, varContext);
array.$inlineCountDiff = array.$inlineCount - serverResult.$inlineCount;
}
array.$addedCount = addedCount;
array.$deletedCount = deletedCount;
return array;
};

Expand Down
2 changes: 1 addition & 1 deletion Samples/Todo/Beetle.Samples.Todo.Knockout/Scripts/beetle.min.js
View file

Large diffs are not rendered by default.

26 changes: 10 additions & 16 deletions _NuGet Packages/content/Scripts/beetle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5447,7 +5447,7 @@
}
return false;
}
return items && items.indexOf(item) >= 0;
return items && items.indexOf(item) > 0;
};

return new ctor();
Expand Down Expand Up @@ -8423,8 +8423,8 @@
// if option need local and server results both, after server query re-run same query on local.
if (execution == enums.executionStrategy.Both) {
newEntities = that.executeQueryLocally(query);
if (inlineCount != null && newEntities.$inlineCountDiff != null)
inlineCount += newEntities.$inlineCountDiff;
if (inlineCount)
inlineCount += newEntities.$addedCount - newEntities.$deletedCount;
}
if (newEntities) {
if (query.inlineCountEnabled && inlineCount != null)
Expand Down Expand Up @@ -8470,29 +8470,23 @@
} else
throw helper.createError(i18N.typeRequiredForLocalQueries);

var array = [], serverArray = [], modifiedClient = false;
var array = [], addedCount = 0, deletedCount = 0;
helper.forEach(entities, function (entity) {
if (entity.$tracker.entityState == enums.entityStates.Added) {
modifiedClient = true;
addedCount++;
array.push(entity);
}
else if (entity.$tracker.entityState == enums.entityStates.Deleted) {
modifiedClient = true;
serverArray.push(entity);
}
else {
else if (entity.$tracker.entityState == enums.entityStates.Deleted)
deletedCount++;
else
array.push(entity);
serverArray.push(entity);
}
});
// get array handling function for query
var func = query.toFunction();
// run function against entities
array = func(array, varContext);
if (array.$inlineCount && modifiedClient) {
var serverResult = func(serverArray, varContext);
array.$inlineCountDiff = array.$inlineCount - serverResult.$inlineCount;
}
array.$addedCount = addedCount;
array.$deletedCount = deletedCount;
return array;
};

Expand Down
2 changes: 1 addition & 1 deletion _NuGet Packages/content/Scripts/beetle.min.js
View file

Large diffs are not rendered by default.

0 comments on commit d38031d

Please sign in to comment.