A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
core: fix stream/iterate stopping early when dateCreated is null (#10541)
Abdullah Atta2c1f05ff1882
diff --git a/packages/core/__tests__/tags.test.ts b/packages/core/__tests__/tags.test.tsindex 4b31bff27..c2c8fb0ef 100644--- a/packages/core/__tests__/tags.test.ts+++ b/packages/core/__tests__/tags.test.ts@@ -145,3 +145,22 @@ describe("sort tags by", () => {}));}});++test("stream & iterate should not stop early when dateCreated is null", () =>+ databaseTest().then(async (db) => {+ for (let i = 0; i < 25; ++i) await db.tags.add({ title: `tag${i}` });+ await db+ .sql()+ .updateTable("tags")+ .set({ dateCreated: null as unknown as number })+ .execute();++ const streamed = [];+ for await (const tag of db.tags.collection.stream(10)) streamed.push(tag);+ expect(streamed).toHaveLength(25);++ const iterated = [];+ const selector = db.tags.collection.createFilter((qb) => qb, 10);+ for await (const tag of selector.iterate()) iterated.push(tag);+ expect(iterated).toHaveLength(25);+ }));diff --git a/packages/core/src/database/sql-collection.ts b/packages/core/src/database/sql-collection.tsindex f6fcff074..b12afc6c5 100644--- a/packages/core/src/database/sql-collection.ts+++ b/packages/core/src/database/sql-collection.ts@@ -339,13 +339,13 @@ export class SQLCollection<const rows = (await this.db().selectFrom<keyof DatabaseSchema>(this.type).where(isFalse("deleted"))- .orderBy("dateCreated asc")+ .orderBy(sql`IFNULL(dateCreated, 0) asc`).orderBy("id asc").$if(lastRow !== null, (qb) =>qb.where(- (eb) => eb.refTuple("dateCreated", "id"),- ">",- (eb) => eb.tuple(lastRow!.dateCreated, lastRow!.id)+ sql<boolean>`(IFNULL(dateCreated, 0), id) > (${+ lastRow!.dateCreated ?? 0+ }, ${lastRow!.id})`)).selectAll()@@ -592,13 +592,13 @@ export class FilteredSelector<T extends Item> {while (true) {const rows = await thisArg.filter- .orderBy("dateCreated asc")+ .orderBy(sql`IFNULL(dateCreated, 0) asc`).orderBy("id asc").$if(lastRow !== null, (qb) =>qb.where(- (eb) => eb.refTuple("dateCreated", "id"),- ">",- (eb) => eb.tuple(lastRow.dateCreated, lastRow.id)+ sql<boolean>`(IFNULL(dateCreated, 0), id) > (${+ lastRow.dateCreated ?? 0+ }, ${lastRow.id})`)).limit(thisArg.batchSize)