Skip to content

Commit a568757

Browse files
update
1 parent dcdabeb commit a568757

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

Magic.IndexedDb/wwwroot/magicLinqToIndexedDb.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,6 @@ export async function* magicQueryYield(db, table, universalSerializedPredicate,
4242
return;
4343
}
4444

45-
if (isUniversalTrue === true) {
46-
debugLog("Universal True, sending back all data");
47-
let allRecords = await table.toArray();
48-
49-
while (allRecords.length > 0) {
50-
let record = allRecords.shift(); // Remove from memory before processing
51-
yield record;
52-
}
53-
return;
54-
}
55-
5645
console.log('flattened serialized predicate');
5746
console.log(nestedOrFilterUnclean);
5847

@@ -66,7 +55,7 @@ export async function* magicQueryYield(db, table, universalSerializedPredicate,
6655
debugLog("Validated schema & cached indexes", { primaryKeys, indexes: indexCache.indexes });
6756

6857
let { isFilterEmpty, nestedOrFilter } =
69-
initiateNestedOrFilter(nestedOrFilterUnclean, queryAdditions, primaryKeys);
58+
initiateNestedOrFilter(nestedOrFilterUnclean, queryAdditions, primaryKeys, isUniversalTrue);
7059

7160
// No need for processing anything, we can just immediately return results.
7261
if (isFilterEmpty) {

Magic.IndexedDb/wwwroot/utilities/nestedOrFilterUtilities.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { debugLog } from "./utilityHelpers.js";
33
import { isValidFilterObject, isValidQueryAdditions } from "./linqValidation.js";
44
import { QUERY_OPERATIONS } from "./queryConstants.js";
55

6-
export function initiateNestedOrFilter(nestedOrFilter, queryAdditions, primaryKeys) {
6+
export function initiateNestedOrFilter(nestedOrFilter, queryAdditions, primaryKeys, isUniversalTrue) {
77
if (!isValidFilterObject(nestedOrFilter)) {
88
throw new Error("Invalid filter object provided to where function.");
99
}
@@ -14,7 +14,7 @@ export function initiateNestedOrFilter(nestedOrFilter, queryAdditions, primaryKe
1414
nestedOrFilter = cleanNestedOrFilter(nestedOrFilter);
1515
debugLog("Cleaned Filter Object", { nestedOrFilter });
1616

17-
let isFilterEmpty = !nestedOrFilter || !nestedOrFilter.orGroups || nestedOrFilter.orGroups.length === 0;
17+
let isFilterEmpty = !nestedOrFilter || !nestedOrFilter.orGroups || isUniversalTrue || nestedOrFilter.orGroups.length === 0;
1818

1919
debugLog("Filter Check After Cleaning", { isFilterEmpty });
2020

TestWasm/Pages/Home.razor

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,9 @@
275275
var d = new DateTime();
276276
var asdf = d.DayOfWeek;
277277
var asdf2 = d.DayOfYear;
278-
// RunTest("Date Year Test", await personQuery.Where(x => x.DateOfBirth.Value.Year >= 2020).ToListAsync(),
279-
// allPeople.Where(x => x.DateOfBirth.HasValue && x.DateOfBirth.Value.Year == 2020));
278+
279+
// RunTest("Date Year Test", await personQuery.Where(x => x.DateOfBirth.Value.Year >= 2020).ToListAsync(),
280+
// allPeople.Where(x => x.DateOfBirth.HasValue && x.DateOfBirth.Value.Year == 2020));
280281
281282

282283
RunTest("Ends With Test", await personQuery.Where(x => x.Name.EndsWith("ack")).ToListAsync(),

0 commit comments

Comments
 (0)