fix bug when sorting falsyBool + cursor

src/EventSourcingDB/EventSourcingDB.js

@@ -272,7 +272,7 @@
 		const reducers = {}
 		const migrationOptions = {queue: this.queue}
 
 		const dispatch = async (type, data, ts) => {
 			if (this._processing) {
 				const store = this._alsDispatch.getStore()
 				dbg({store})
@@ -412,9 +412,9 @@
 			if (wantVersion > this._minVersion) this._minVersion = wantVersion
 		} else if (!this._isPolling) {
 			this._isPolling = true
 			// @ts-ignore
 			if (module.hot) {
 				// @ts-ignore
 				module.hot.dispose(() => {
 					this.stopPolling()
 				})
@@ -461,7 +461,7 @@
 	 * @param {number} [ts] The timestamp of the event.
 	 * @returns {Promise<Event>} The processed event.
 	 */
 	dispatch = makeDispatcher('dispatch', async (type, data, ts) => {
 		const event = await this.queue.add(type, data, ts)
 		return this.handledVersion(event.v)
 	})
@@ -543,7 +543,7 @@
 				}
 			}
 			if (o && process.env.NODE_ENV === 'test') {
 				// @ts-ignore
 				if (!this.__BE_QUIET)
 					// eslint-disable-next-line no-console
 					console.error(
@@ -633,7 +633,7 @@
 					return _resultQueue.set(result)
 				})
 				.catch(error => {
 					// @ts-ignore
 					if (!this.__BE_QUIET)
 						// eslint-disable-next-line no-console
 						console.error(
@@ -652,7 +652,7 @@
 
 			if (resultEvent.error) {
 				errorCount++
 				// @ts-ignore
 				if (!this.__BE_QUIET) {
 					let path, error
 					// find the deepest error
@@ -697,7 +697,6 @@
 			}
 		}
 		return lastV
-		/* eslint-enable no-await-in-loop */
 	}
 
 	async _preprocessor(cache, event, isMainEvent) {
@@ -775,7 +774,7 @@
 				}
 				let out
 				try {
 					// @ts-ignore
 					out = await model.reducer(helpers)
 				} catch (error) {
 					out = {
@@ -877,7 +876,7 @@
 		if (event.error) return event
 
 		// Allow GC
 		// @ts-ignore
 		cache = null
 
 		event = await this._applyEvent(event, isMainEvent)
@@ -966,7 +965,7 @@
 					return addEvent(...args)
 				}
 				await settleAll(this._deriverModels, async model =>
 					// @ts-ignore
 					model.deriver({
 						event,
 						model,

src/JsonModel/JM-search.test.js

@@ -252,6 +252,56 @@ describe('search cursor', () => {
 			total: 10,
 		})
 	})
+
+	test('search with sort, cursor, limit - limit < total, some sorted values = falsyBool', async () => {
+		const totalCount = await m.count()
+		const falsyBoolFalseCount = await m.count({x2: false})
+		const falsyBoolTrueCount = await m.count({x2: true})
+
+		const pageCount = falsyBoolTrueCount + 1
+		// to make sure there are results on page2
+		expect(falsyBoolFalseCount - pageCount).toBeTruthy()
+
+		const searchOptions = {
+			// true first
+			sort: {x2: -1},
+			limit: pageCount,
+			cols: ['id', 'x2'],
+		}
+		const page1 = await m.search({}, searchOptions)
+
+		expect(page1).toEqual({
+			cursor: '!_N~1',
+			items: [
+				{id: 2, x2: 1},
+				{id: 4, x2: 1},
+				{id: 6, x2: 1},
+				{id: 8, x2: 1},
+				{id: 10, x2: 1},
+				{id: 12, x2: 1},
+				{id: 14, x2: 1},
+				{id: 1},
+			],
+			prevCursor: '!!1~2',
+			total: 14,
+		})
+
+		const page2Count = await m.count(
+			{},
+			{...searchOptions, cursor: page1.cursor}
+		)
+		const remainingAfterPage1 = totalCount - pageCount
+		expect(page2Count).toEqual(
+			remainingAfterPage1 < pageCount ? remainingAfterPage1 : pageCount
+		)
+		const page2 = await m.search({}, {...searchOptions, cursor: page1.cursor})
+		expect(page2).toEqual({
+			cursor: undefined,
+			items: [{id: 3}, {id: 5}, {id: 7}, {id: 9}, {id: 11}, {id: 13}],
+			prevCursor: '!!_N~3',
+			total: 14,
+		})
+	})
 })
 
 test('search itemsOnly', async () => {

src/JsonModel/JsonModel.js

@@ -394,9 +394,15 @@ class JsonModelImpl {
 			cursorQ = `${cursorColAliases[len]}${getDir(len)}?`
 			cursorArgs = [cursorVals[len]] // ID added at first
 			for (let i = len - 1; i >= 0; i--) {
-				cursorQ =
-					`(${cursorColAliases[i]}${getDir(i)}=?` +
-					` AND (${cursorColAliases[i]}!=? OR ${cursorQ}))`
+				const colAlias = cursorColAliases[i]
+				const isFalsyBool = Object.values(this.columns).find(
+					c => c.alias === colAlias
+				).falsyBool
+				cursorQ = isFalsyBool
+					? `(COALESCE(${colAlias}, 0)${getDir(i)}=COALESCE(?, 0)` +
+						` AND (COALESCE(${colAlias},0)!=COALESCE(?, 0) OR ${cursorQ}))`
+					: `(${cursorColAliases[i]}${getDir(i)}=?` +
+						` AND (${cursorColAliases[i]}!=? OR ${cursorQ}))`
 				const val = cursorVals[i]
 				cursorArgs.unshift(val, val)
 			}