@trenskow/pged 5.1.37 → 5.1.39

package/lib/query-builder.js

@@ -50,6 +50,25 @@ export default class QueryBuilder extends CustomPromise {
 
 	}
 
+	get _transforms() {
+		return {
+			function: ({ name, parameters }) => {
+				return `${name}(${parameters.map((parameter) => this._resolveConstruct(parameter)).join(', ')})`;
+			}
+		};
+	}
+
+	_resolveConstruct(construct, transforms) {
+		if (typeof construct === 'string') {
+			if (construct[0] === ':') return this._dbCase(construct.substring(1));
+			else {
+				this._queryParameters = (this._queryParameters || []).concat([construct]);
+				return `$${this._queryParameters.length}`;
+			}
+		}
+		return (transforms || this._transforms)[construct.type](construct);
+	}
+
 	_dbCasePart(input, quote) {
 		return input
 			.split(/"|'/)
@@ -101,7 +120,23 @@ export default class QueryBuilder extends CustomPromise {
 	}
 
 	select(keys = ['*']) {
-		if (typeof keys !== 'string' || keys[0] !== ':') {
+		if (typeof keys === 'function') {
+			keys = keys({
+				rank: ({ column, language, query }) => ({
+					type: 'alias',
+					name: 'rank',
+					value: {
+						type: 'function',
+						name: 'ts_rank',
+						parameters: [ column, {
+							type: 'function',
+							name: 'websearch_to_tsquery',
+							parameters: (language ? [language] : []).concat([query])
+						} ]
+					}
+				})
+			});
+		} else if (typeof keys !== 'string' || keys[0] !== ':') {
 			if (!Array.isArray(keys)) {
 				keys = [].concat(...keys.split('"').map((key, idx) => {
 					if (idx % 2 == 0) return key.split(/, ?/);
@@ -113,6 +148,11 @@ export default class QueryBuilder extends CustomPromise {
 		return this;
 	}
 
+	distinct(column) {
+		this._distinct = column || true;
+		return this;
+	}
+
 	groupBy(element) {
 		this._groupBy = element;
 		return this;
@@ -202,6 +242,7 @@ export default class QueryBuilder extends CustomPromise {
 			}));
 		} else {
 			if (typeof conditions !== 'object') throw new TypeError('Conditions must be an object.');
+			else if (['comparison'].includes(conditions?.type)) return conditions;
 			return Object.keys(conditions).map((key) => {
 				let obj = {};
 				const dbKey = this._dbCase(key);
@@ -218,6 +259,20 @@ export default class QueryBuilder extends CustomPromise {
 	}
 
 	where(conditions) {
+		if (typeof conditions === 'function') {
+			conditions = conditions({
+				search: ({ column, language, query }) => ({
+					type: 'comparison',
+					lhs: column,
+					operator: '@@',
+					rhs: {
+						type: 'function',
+						name: 'websearch_to_tsquery',
+						parameters: (language ? [language] : []).concat([query])
+					}
+				})
+			});
+		}
 		this._conditions = this._conditions.concat(this._formalizeConditions(conditions));
 		return this;
 	}
@@ -307,45 +362,6 @@ export default class QueryBuilder extends CustomPromise {
 		return this;
 	}
 
-	search({ column, query, language, type = 'web' }) {
-
-		if (language?.[0] === ':') language = this._dbCase(language.substring(1));
-		else {
-			this._queryParameters = (this._queryParameters || []).concat([language]);
-			language = `$${this._queryParameters.length}`;
-		}
-
-		this._queryParameters = (this._queryParameters || []).concat([query]);
-		query = `$${this._queryParameters.length}`;
-
-		const vectorConverter = type === 'web' ? 'websearch_to_tsquery' : 'to_tsquery';
-
-		let vectorConverterArgs = [query];
-
-		if (language) {
-			vectorConverterArgs.unshift(language);
-		}
-
-		column = this._dbCase(column);
-
-		this._selectKeys = (this._selectKeys || []).concat([
-			`ts_rank(${column}, ${vectorConverter}(${vectorConverterArgs.join(', ')})) as rank`
-		]);
-
-		this._sortingKeys = this._sortingKeys.concat([{
-			key: 'rank',
-			order: 'desc'
-		}]);
-
-		return this
-			.where({
-				$fullText: {
-					[`:${column}`]: `:${vectorConverter}(${vectorConverterArgs.join(', ')})`
-				}
-			});
-
-	}
-
 	_canQuote(key) {
 		if (key === '*') return false;
 		if (key.toLowerCase().includes(' as ')) return false;
@@ -354,12 +370,15 @@ export default class QueryBuilder extends CustomPromise {
 	}
 
 	_buildKeys(keys = ['*'], quote) {
-		return keys.map((key) => {
+		return (this._distinct ? [this._distinct === true ? 'distinct' : `distinct on (${this._dbCase(this._distinct)})`] : []).concat(keys.map((key) => {
+			if (typeof key === 'object' && key !== null && !Array.isArray(key)) return this._resolveConstruct(key, {
+				alias: ({ name, value }) => `${this._resolveConstruct(value)} as ${name}`
+			});
 			if (key.substring(0, 1) == ':') return key.substring(1);
 			let as = key.split(':');
 			if (as.length == 1) return this._dbCase(as[0], quote && this._canQuote(key));
 			return `${this._dbCase(as[0], quote)} as ${this._dbCase(as[1])}`;
-		}).concat(this._paginated ? `count(${this._table}.*) over() as total` : []).join(', ');
+		}).concat(this._paginated ? `count(${this._table}.*) over() as total` : []).join(', ')).join(' ');
 	}
 
 	_formatParameter(keyPath, value) {
@@ -417,6 +436,14 @@ export default class QueryBuilder extends CustomPromise {
 
 		const result = conditions.map((condition) => {
 
+			if (['comparison'].includes(condition?.type)) {
+				return this._resolveConstruct(condition, {
+					comparison: ({ lhs, operator, rhs }) => {
+						return `${this._resolveConstruct(lhs)} ${operator} ${this._resolveConstruct(rhs)}`;
+					}
+				});
+			}
+
 			let key = Object.keys(condition)[0];
 
 			if (key.substring(0, 1) == '$') {
@@ -680,7 +707,7 @@ export default class QueryBuilder extends CustomPromise {
 				.filter((table) => !Object.keys(tableInformation).includes(table));
 
 			await Promise.all(tables.map(async (table) => {
-				const rows = await this._connection.exec(`SELECT column_name, data_type FROM information_schema.columns WHERE table_name = '${table}';`, [], { format: 'raw' });
+				const rows = await this._connection.exec(`SELECT column_name, data_type FROM information_schema.columns WHERE table_name = '${this._dbCase(table)}';`, [], { format: 'raw' });
 				Object.assign(tableInformation, Object.fromEntries([[table, Object.fromEntries(rows.map((row) => {
 					return [row.column_name, row.data_type];
 				}))]]));
@@ -693,6 +720,17 @@ export default class QueryBuilder extends CustomPromise {
 
 		await this._resolveTableInformation();
 
+		if (this._paginated && !this._first && this._limit === 0) {
+			delete this._paginated;
+			delete this._offset;
+			delete this._limit;
+			this._sortingKeys = [];
+			return {
+				total: parseInt(await this.count('*')._exec()),
+				items: []
+			};
+		}
+
 		const [query, parameters] = this._build();
 
 		let rows = await this._connection.exec(
@@ -708,14 +746,8 @@ export default class QueryBuilder extends CustomPromise {
 		}
 
 		if (this._paginated && !this._first) {
-			let total;
-			if (rows.length == 0) {
-				delete this._paginated;
-				delete this._offset;
-				delete this._limit;
-				this._sortingKeys = [];
-				total = parseInt(await this.count('*')._exec());
-			} else {
+			let total = 0;
+			if (rows.length > 0) {
 				total = parseInt(((rows || [])[0] || {})['total'] || 0);
 			}
 			rows.forEach((item) => delete item.total);
@@ -733,8 +765,8 @@ export default class QueryBuilder extends CustomPromise {
 			.catch((error) => this._reject(error));
 
 		return super
-			.then(resolve, reject)
+			.then(resolve, reject);
 
 	}
 
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@trenskow/pged",
-	"version": "5.1.37",
+	"version": "5.1.39",
 	"description": "Just a silly little db management and query builder for PostgreSQL.",
 	"main": "index.js",
 	"type": "module",