@trenskow/pged 4.0.9 → 4.1.2

package/index.js

@@ -89,7 +89,8 @@ module.exports = exports = class PGed {
 		return result;
 	}
 
-	_convertResult(result) {
+	_convertResult(result, options) {
+		if ((options || {}).format === 'raw') return (result || {}).rows;
 		return ((result || {}).rows || []).map((row) => {
 			let newRow = {};
 			Object.keys(row).forEach((key) => {
@@ -209,7 +210,7 @@ module.exports = exports = class PGed {
 
 		let result;
 
-		const todo = async () => result = this._convertResult(await this._query(query, parameters));
+		const todo = async () => result = this._convertResult(await this._query(query, parameters), options);
 
 		if (this._transactions.always || options.transaction) await this.transaction(todo);
 		else await this.retained(todo);
@@ -225,25 +226,7 @@ module.exports = exports = class PGed {
 	}
 
 	_queryBuild(table) {
-		return new QueryBuilder(table, this._options, async (queryBuilder) => {
-
-			const [query, parameters] = queryBuilder._build();
-
-			let result = await this.exec(
-				query,
-				parameters,
-				{
-					first: queryBuilder._first,
-					transaction: queryBuilder._transaction
-				});
-
-			if (['null', 'undefined'].includes(typeof result)) {
-				result = queryBuilder._defaultResult;
-			}
-
-			return result;
-
-		});
+		return new QueryBuilder(table, this._options, this);
 	}
 
 	from(table) {

package/package.json

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

package/query-builder.js

@@ -2,11 +2,15 @@
 
 const
 	caseit = require('@trenskow/caseit'),
-	CustomPromise = require('@trenskow/custom-promise');
+	CustomPromise = require('@trenskow/custom-promise'),
+	Puqeue = require('puqeue');
+
+const tableInformationQueue = new Puqeue();
+const tableInformation = {};
 
 module.exports = exports = class QueryBuilder extends CustomPromise {
 
-	constructor(table, options = {}, executor) {
+	constructor(table, options = {}, connection) {
 
 		super();
 
@@ -36,7 +40,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 
 		this._offset = 0;
 
-		this._executor = executor;
+		this._connection = connection;
 
 	}
 
@@ -118,9 +122,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;
 	}
 
@@ -277,6 +289,17 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 		}).concat(this._paginated ? `count(${this._table}.*) over() as total` : []).join(', ');
 	}
 
+	_formatParameter(keyPath, value) {
+		let [table, key] = keyPath.split('.');
+		if (typeof key === 'undefined') [table, key] = [this._table, table];
+		switch ((tableInformation[caseit(table, this._options.casing.db)] || {})[caseit(key, this._options.casing.db)]) {
+			case 'jsonb':
+				return typeof value === 'string' ? value : JSON.stringify(value);
+			default:
+				return value;
+		}
+	}
+
 	get _operatorMap() {
 		return {
 			'$or': 'or',
@@ -373,11 +396,11 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 			}
 
 			if (!Array.isArray(condition[key])) {
-				this._queryParameters.push(condition[key]);
+				this._queryParameters.push(this._formatParameter(key, condition[key]));
 				return this._buildCondition(dbKey, comparer, `$${this._queryParameters.length}`);
 			} else {
 				const values = condition[key].map((value) => {
-					this._queryParameters.push(value);
+					this._queryParameters.push(this._formatParameter(key, value));
 					return `$${this._queryParameters.length}`;
 				});
 				return this._buildCondition(dbKey, comparer, `any(array[${values.join(',')}])`);
@@ -419,15 +442,24 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 	}
 
 	_buildSorting() {
+
 		if (!this._sortingKeys.length) return;
+
 		const escapeIfNeeded = (value) => {
 			if (value.substring(0, 1) == ':') return value.substring(1);
 			return this._dbCase(value, true);
 		};
-		return `order by ${this._sortingKeys.map((key) => {
-			if (key.substring(0, 1) == '-') return `${escapeIfNeeded(key.substring(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() {
@@ -448,7 +480,7 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 			} else if (/^:/.test(value)) {
 				value = value.substring(1);
 			} else {
-				this._queryParameters.push(value);
+				this._queryParameters.push(this._formatParameter(key, value));
 				value = `$${this._queryParameters.length}`;
 			}
 			return `${this._dbCase(key, true)} = ${value}`;
@@ -460,8 +492,8 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 	}
 
 	_buildInsertValues() {
-		return this._insertValues.map((value) => {
-			this._queryParameters.push(value);
+		return this._insertValues.map((value, idx) => {
+			this._queryParameters.push(this._formatParameter(this._insertKeys[idx], value));
 			return `$${this._queryParameters.length}`;
 		}).join(', ');
 	}
@@ -547,8 +579,41 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 
 	}
 
+	async _resolveTableInformation() {
+		await tableInformationQueue.add(async () => {
+
+			const tables = [this._table]
+				.concat(this._joins.map((join) => join.table))
+				.filter((table) => !Object.keys(tableInformation).includes(table));
+
+			await Promise.all(tables.map(async (table) => {
+				const rows = await this._connection.exec(`SELECT column_name, data_type FROM information_schema.columns WHERE table_name = '${table}';`, [], { format: 'raw' });
+				Object.assign(tableInformation, Object.fromEntries([[table, Object.fromEntries(rows.map((row) => {
+					return [row.column_name, row.data_type];
+				}))]]));
+			}));
+
+		});
+	}
+
 	async _exec() {
-		const rows = await this._executor(this);
+
+		await this._resolveTableInformation();
+
+		const [query, parameters] = this._build();
+
+		let rows = await this._connection.exec(
+			query,
+			parameters,
+			{
+				first: this._first,
+				transaction: this._transaction
+			});
+
+		if (['null', 'undefined'].includes(typeof rows)) {
+			rows = this._defaultResult;
+		}
+
 		if (this._paginated && !this._first) {
 			let total;
 			if (rows.length == 0) {
@@ -563,7 +628,9 @@ module.exports = exports = class QueryBuilder extends CustomPromise {
 			rows.forEach((item) => delete item.total);
 			return { total, items: rows };
 		}
+
 		return rows;
+
 	}
 
 	then(resolve, reject) {