JsonModel makeSelect: add disctinct

src/JsonModel/JM-makeSelect.test.js

@@ -299,3 +299,15 @@ test('sum', async () => {
 	await m.set({v: '8'})
 	expect(await m.sum('v')).toBe(13)
 })
+
+test('distinct', async () => {
+	const m = getModel({})
+	expect(m.makeSelect({distinct: true})).toEqual([
+		'SELECT DISTINCT tbl."id" AS _i,tbl."json" AS _j FROM "testing" tbl',
+		[],
+		undefined,
+		'SELECT COUNT(*) as t from ( SELECT DISTINCT tbl."id" AS _i,tbl."json" AS _j FROM "testing" tbl )',
+		[],
+		false,
+	])
+})

src/JsonModel/JsonModel.js

@@ -311,6 +311,7 @@
 						'attrs',
 						'cols',
 						'cursor',
+						'distinct',
 						'join',
 						'joinVals',
 						'limit',
@@ -326,17 +327,18 @@
 			}
 		}
 		let {
-			cols,
 			attrs,
+			cols,
+			cursor,
+			distinct,
 			join,
 			joinVals,
-			where: extraWhere,
 			limit,
-			offset,
-			sort,
-			cursor,
 			noCursor,
 			noTotal,
+			offset,
+			sort,
+			where: extraWhere,
 		} = options
 
 		cols = cols || this.selectColNames
@@ -405,7 +407,9 @@
 				: cols
 						.map(c => (this.columns[c] ? this.columns[c].select : c))
 						.join(',')
-		const selectQ = `SELECT ${colsSql} FROM ${this.quoted} tbl`
+		const selectQ = `SELECT${distinct ? ' DISTINCT' : ''} ${colsSql} FROM ${
+			this.quoted
+		} tbl`
 
 		const vals = []
 		const conds = []
@@ -496,7 +500,7 @@
 			[`SELECT COUNT(*) as t from (`, selectQ, join, whereQ, ')']
 				.filter(Boolean)
 				.join(' ')
 		// TODO next major make this an object
 		return [q, qVals, cursorColAliases, totalQ, vals, invert]
 	}
 
@@ -724,8 +728,8 @@
 	 * @param {IDValue[]} ids                   - the values for the column.
 	 * @param {string}    [colName=this.idCol]  - the columnname, defaults to the
 	 *                                          ID column.
 	 * @returns {Promise<(Item | null)[]>} - the objects, or null where they don't
 	 *                                     exist, in order of their requested ID.
 	 */
 	async getAll(ids, colName = this.idCol) {
 		let {path, _getAllSql} = this.columns[colName]
@@ -798,7 +802,7 @@
 	 * @param {JMSearchAttrs | RowCallback} attrsOrFn
 	 * @param {RowCallback | JMSearchOptions} [optionsOrFn]
 	 * @param {RowCallback} [fn]
 	 * @returns {Promise<void>} Table iteration completed.
 	 */
 	async each(attrsOrFn, optionsOrFn, fn) {
 		if (!fn) {