@trenskow/pged 4.0.7 → 4.1.0

package/index.js

@@ -229,7 +229,7 @@ module.exports = exports = class PGed {
 
 			const [query, parameters] = queryBuilder._build();
 
-			return await this.exec(
+			let result = await this.exec(
 				query,
 				parameters,
 				{
@@ -237,6 +237,12 @@ module.exports = exports = class PGed {
 					transaction: queryBuilder._transaction
 				});
 
+			if (['null', 'undefined'].includes(typeof result)) {
+				result = queryBuilder._defaultResult;
+			}
+
+			return result;
+
 		});
 	}
 

package/package.json

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

package/query-builder.js

@@ -49,8 +49,8 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 					.split('.')
 					.map((part) => {
 						let doQuote = quote;
-						if (part.substr(0, 1) === '!' && quote) {
-							part = part.substr(1);
+						if (part.substring(0, 1) === '!' && quote) {
+							part = part.substring(1);
 							doQuote = false;
 						}
 						part = part
@@ -118,9 +118,17 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 		return this;
 	}
 
-	sorted(keys) {
-		if (!Array.isArray(keys)) keys = keys.split(/, ?/);
-		this._sortingKeys = keys;
+	sorted(sortingKeys) {
+		if (typeof sortingKeys === 'string') sortingKeys = sortingKeys.split(/, ?/);
+		if (!Array.isArray(sortingKeys)) sortingKeys = [sortingKeys];
+		sortingKeys = sortingKeys.map((sortingKey) => {
+			if (typeof sortingKey === 'string') return {
+				key: sortingKey.substring(0, 1) === '-' ? sortingKey.substring(1) : sortingKey,
+				order: sortingKey.substring(0, 1) === '-' ? 'desc' : 'asc'
+			};
+			return sortingKey;
+		});
+		this._sortingKeys = this._sortingKeys.concat(sortingKeys);
 		return this;
 	}
 
@@ -189,8 +197,8 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 						options.conditions = {};
 						options.local = options.local || this._defaultPrimaryKey;
 						options.foreign = options.foreign || this._defaultPrimaryKey;
-						let local = options.local.substr(0, 1) == ':' ? this._dbCase(options.local) : `:${this._table}.${this._dbCase(options.local)}`;
-						let foreign = options.foreign.substr(0, 1) == ':' ? this._dbCase(options.foreign.substr(1)) : `${this._dbCase(options.table)}.${this._dbCase(options.foreign)}`;
+						let local = options.local.substring(0, 1) == ':' ? this._dbCase(options.local) : `:${this._table}.${this._dbCase(options.local)}`;
+						let foreign = options.foreign.substring(0, 1) == ':' ? this._dbCase(options.foreign.substring(1)) : `${this._dbCase(options.table)}.${this._dbCase(options.foreign)}`;
 						options.conditions[local] = foreign;
 					}
 					options.conditions = this._formalizeConditions(options.conditions);
@@ -213,6 +221,22 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 		return this;
 	}
 
+	sum(key) {
+
+		if (key.key) {
+			if (key.table) key = `"${this._dbCase(key.table)}"."${this._dbCase(key.key)}"`;
+			else key = `"${this._dbCase(key.key)}"`;
+		}
+
+		this._selectKeys = [`:sum(${key}) AS sum`];
+		this._limit = 1;
+		this._first = 'sum';
+		this._defaultResult = 0;
+
+		return this;
+
+	}
+
 	onConflict(keys, action) {
 
 		if (this._command !== 'insert') throw new Error('`onConflict` is only available when inserting.');
@@ -254,7 +278,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 
 	_buildKeys(keys = ['*'], quote) {
 		return keys.map((key) => {
-			if (key.substr(0, 1) == ':') return key.substr(1);
+			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])}`;
@@ -306,7 +330,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 
 			let key = Object.keys(condition)[0];
 
-			if (key.substr(0, 1) == '$') {
+			if (key.substring(0, 1) == '$') {
 				switch (caseit(key)) {
 					case '$or':
 					case '$and':
@@ -328,15 +352,15 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 				}
 			}
 
-			if (key.substr(0, 1) == ':') {
-				return this._buildCondition(key.substr(1), comparer, this._dbCase(condition[key]));
+			if (key.substring(0, 1) == ':') {
+				return this._buildCondition(key.substring(1), comparer, this._dbCase(condition[key]));
 			}
 
 			let dbKey = key;
 
 			if (dbKey.indexOf('.') == -1) {
-				if (dbKey.substr(0, 1) === '!') {
-					dbKey = dbKey.substr(1);
+				if (dbKey.substring(0, 1) === '!') {
+					dbKey = dbKey.substring(1);
 				} else {
 					dbKey = dbKey
 						.split('->')
@@ -403,15 +427,24 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 	}
 
 	_buildSorting() {
+
 		if (!this._sortingKeys.length) return;
+
 		const escapeIfNeeded = (value) => {
-			if (value.substr(0, 1) == ':') return value.substr(1);
+			if (value.substring(0, 1) == ':') return value.substring(1);
 			return this._dbCase(value, true);
 		};
-		return `order by ${this._sortingKeys.map((key) => {
-			if (key.substr(0, 1) == '-') return `${escapeIfNeeded(key.substr(1))} desc`;
-			return escapeIfNeeded(key);
+
+		return `order by ${this._sortingKeys.map((sortingKey) => {
+			let condition = escapeIfNeeded(sortingKey.key);
+			if (Array.isArray(sortingKey.values)) {
+				condition = `case ${this._dbCase(sortingKey.key)} ${sortingKey.values.map((value, idx) => {
+					return `when '${value}' then ${idx}`;
+				}).join(' ')} end`;
+			}
+			return `${condition}${sortingKey.order === 'desc' ? ' desc' : ''}`;
 		}).join(', ')}`;
+
 	}
 
 	_buildOffset() {
@@ -430,7 +463,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 			if (value == null) {
 				value = 'null';
 			} else if (/^:/.test(value)) {
-				value = value.substr(1);
+				value = value.substring(1);
 			} else {
 				this._queryParameters.push(value);
 				value = `$${this._queryParameters.length}`;