@trenskow/pged 3.0.2 → 4.0.3

package/README.md

@@ -15,7 +15,8 @@ const updatedUser = await db.transaction(async () => {
     await db
         .from('users')
         .where({ id: 12 })
-        .update({ username: 'myusername' });
+        .update({ username: 'myusername' })
+        .go();
     
     return await db
         .from('users')
@@ -26,7 +27,8 @@ const updatedUser = await db.transaction(async () => {
                 id: 12,
                 username: 'myusername'
             }
-        });
+        })
+        .go();
 
 });
 ````
@@ -39,11 +41,11 @@ Transactions can be inside transactions - the library will figure out when to co
 
 These options are supported when creating a new `PGed` instance.
 
-| Name        | Type         | Description | Values | Default    |
-|:------------|:------------:|:------------|:-------|:-----------|
-| `casing`    | `Object`     | See below
-| `casing.db` | `String`     | The casing to use in the db. | Any supported by the [caseit](https://www.npmjs.com/package/@trenskow/caseit) package. | `snake` |
-| `casing.js` | `String`     | The casing to use in js. | Same as above | `camel`
+| Name        |   Type   | Description                  | Values                                                                                 | Default |
+| :---------- | :------: | :--------------------------- | :------------------------------------------------------------------------------------- | :------ |
+| `casing`    | `Object` | See below                    |
+| `casing.db` | `String` | The casing to use in the db. | Any supported by the [caseit](https://www.npmjs.com/package/@trenskow/caseit) package. | `snake` |
+| `casing.js` | `String` | The casing to use in js.     | Same as above                                                                          | `camel` |
 
 ### PostgreSQL Connection
 

package/index.js

@@ -3,8 +3,7 @@
 const
 	Puqeue = require('puqeue'),
 	caseit = require('@trenskow/caseit'),
-	{ Pool } = require('pg'),
-	from = require('@trenskow/from');
+	{ Pool } = require('pg');
 
 const
 	QueryBuilder = require('./query-builder');

package/package.json

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

package/query-builder.js

@@ -39,16 +39,6 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 
 		this._executor = executor;
 
-		this._immediate = setImmediate(() => {
-			this._exec()
-				.then((result) => {
-					this._resolve(result);
-				})
-				.catch((error) => {
-					this._reject(error);
-				});
-		});
-
 	}
 
 	_dbCase(input, quote) {
@@ -78,7 +68,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 
 	select(keys = ['*']) {
 		if (!Array.isArray(keys)) {
-			keys = [].concat(...keys.split('\"').map((key, idx) => {
+			keys = [].concat(...keys.split('"').map((key, idx) => {
 				if (idx % 2 == 0) return key.split(/, ?/);
 				return [key];
 			})).filter((key) => key);
@@ -290,7 +280,8 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 			$gte: '>=',
 			$regexp: '~*',
 			$jsonContains: '@>',
-			$jsonNotContains: '@>'
+			$jsonNotContains: '@>',
+			$jsonArrayContains: '?'
 		};
 	}
 
@@ -301,7 +292,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 	}
 
 	_buildCondition(lhs, comparer, rhs) {
-		const casedComparer = caseit(comparer)
+		const casedComparer = caseit(comparer);
 		const condition = `${lhs} ${this._comparerMap[casedComparer]} ${rhs}`;
 		const prefix = this._comparerPrefixMap[casedComparer];
 		if (!prefix) return condition;
@@ -331,6 +322,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 					case '$regexp':
 					case '$jsonContains':
 					case '$jsonNotContains':
+					case 'jsonArrayContains':
 						return this._buildConditions(condition[key], operator, key, true);
 					default:
 						throw new TypeError(`Unknown modifier ${caseit(key)}.`);
@@ -475,6 +467,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 		switch (Object.keys(this._onConflict.action || {})[0] || 'nothing') {
 			case 'nothing':
 				result += 'nothing';
+				break;
 			case 'update':
 				result += `update ${this._buildUpdateKeysAndValues(this._onConflict.action.update.keys, this._onConflict.action.update.values)}`;
 				break;
@@ -558,8 +551,11 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 		return rows;
 	}
 
-	exec() {
-		return this;
+	then(resolve, reject) {
+		super.then(resolve, reject);
+		this._exec()
+			.then((...args) => this._resolve(...args))
+			.catch((error) => this._reject(error));
 	}
 
 };