@trenskow/pged 4.0.4 → 4.0.8

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.4",
+  "version": "4.0.8",
   "description": "Just a silly little db management and query builder for PostgreSQL.",
   "main": "index.js",
   "scripts": {

package/query-builder.js

@@ -35,7 +35,6 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 		this._having = [];
 
 		this._offset = 0;
-		this._limit = Infinity;
 
 		this._executor = executor;
 
@@ -130,7 +129,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 		return this;
 	}
 
-	limitTo(limit = Infinity) {
+	limitTo(limit) {
 		this._limit = limit;
 		return this;
 	}
@@ -214,6 +213,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.');
@@ -259,7 +274,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 			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(*) over() as total' : []).join(', ');
+		}).concat(this._paginated ? `count(${this._table}.*) over() as total` : []).join(', ');
 	}
 
 	get _operatorMap() {
@@ -421,7 +436,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 	}
 
 	_buildLimit() {
-		if ((this._limit || Infinity) == Infinity) return;
+		if (typeof this._limit === 'undefined') return;
 		return `limit ${this._limit}`;
 	}