@trenskow/pged 4.0.3 → 4.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/pged",
-  "version": "4.0.3",
+  "version": "4.0.7",
   "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;
 	}
@@ -259,7 +258,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() {
@@ -322,7 +321,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 					case '$regexp':
 					case '$jsonContains':
 					case '$jsonNotContains':
-					case 'jsonArrayContains':
+					case '$jsonArrayContains':
 						return this._buildConditions(condition[key], operator, key, true);
 					default:
 						throw new TypeError(`Unknown modifier ${caseit(key)}.`);
@@ -421,7 +420,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}`;
 	}