@trenskow/pged 4.0.1 → 4.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/pged",
-  "version": "4.0.1",
+  "version": "4.0.5",
   "description": "Just a silly little db management and query builder for PostgreSQL.",
   "main": "index.js",
   "scripts": {
@@ -23,6 +23,7 @@
   "homepage": "https://github.com/trenskow/pged#readme",
   "dependencies": {
     "@trenskow/caseit": "^1.1.0",
+    "@trenskow/custom-promise": "^0.10.1",
     "pg": "^8.7.1",
     "puqeue": "^1.0.5"
   }

package/query-builder.js

@@ -1,12 +1,15 @@
 'use strict';
 
 const
-	caseit = require('@trenskow/caseit');
+	caseit = require('@trenskow/caseit'),
+	CustomPromise = require('@trenskow/custom-promise');
 
-module.exports = exports = class QueryBuilder {
+module.exports = exports = class QueryBuilder extends CustomPromise {
 
 	constructor(table, options = {}, executor) {
 
+		super();
+
 		this._options = options;
 
 		options.casing = options.casing || {};
@@ -277,7 +280,8 @@ module.exports = exports = class QueryBuilder {
 			$gte: '>=',
 			$regexp: '~*',
 			$jsonContains: '@>',
-			$jsonNotContains: '@>'
+			$jsonNotContains: '@>',
+			$jsonArrayContains: '?'
 		};
 	}
 
@@ -318,6 +322,7 @@ module.exports = exports = class QueryBuilder {
 					case '$regexp':
 					case '$jsonContains':
 					case '$jsonNotContains':
+					case '$jsonArrayContains':
 						return this._buildConditions(condition[key], operator, key, true);
 					default:
 						throw new TypeError(`Unknown modifier ${caseit(key)}.`);
@@ -416,7 +421,7 @@ module.exports = exports = class QueryBuilder {
 	}
 
 	_buildLimit() {
-		if ((this._limit || Infinity) == Infinity) return;
+		if (typeof this._limit === 'undefined') return;
 		return `limit ${this._limit}`;
 	}
 
@@ -546,8 +551,11 @@ module.exports = exports = class QueryBuilder {
 		return rows;
 	}
 
-	async go() {
-		return await this._exec();
+	then(resolve, reject) {
+		super.then(resolve, reject);
+		this._exec()
+			.then((...args) => this._resolve(...args))
+			.catch((error) => this._reject(error));
 	}
 
 };