@trenskow/pged 5.0.32 → 5.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/pged",
-  "version": "5.0.32",
+  "version": "5.1.0",
   "description": "Just a silly little db management and query builder for PostgreSQL.",
   "main": "index.js",
   "type": "module",
@@ -23,10 +23,11 @@
   },
   "homepage": "https://github.com/trenskow/pged#readme",
   "dependencies": {
-    "@trenskow/async-event-emitter": "^0.1.12",
-    "@trenskow/caseit": "^1.3.9",
+    "@trenskow/async-event-emitter": "^0.1.13",
+    "@trenskow/caseit": "^1.3.10",
     "@trenskow/custom-promise": "^0.10.3",
+    "@trenskow/parse": "^0.1.15",
     "pg": "^8.11.3",
-    "puqeue": "^1.0.16"
+    "puqeue": "^1.0.17"
   }
 }

package/query-builder.js

@@ -1,6 +1,7 @@
 import caseit from '@trenskow/caseit';
 import CustomPromise from '@trenskow/custom-promise';
 import Puqeue from 'puqeue';
+import parse from '@trenskow/parse';
 
 const tableInformationQueue = new Puqeue();
 const tableInformation = {};
@@ -41,7 +42,7 @@ export default class QueryBuilder extends CustomPromise {
 
 	}
 
-	_dbCase(input, quote) {
+	_dbCasePart(input, quote) {
 		return input
 			.split(/"|'/)
 			.map((part, idx) => {
@@ -66,6 +67,31 @@ export default class QueryBuilder extends CustomPromise {
 			.join('');
 	}
 
+	_dbCase(input, quote) {
+
+		const parts = parse(['(', ')'], { maxDepth: 1, boundaries: 'include' }).do(input);
+
+		if (Array.isArray(parts)) {
+			return parts
+				.filter((part) => part.length)
+				.map((part) => this._dbCase(part, quote))
+				.join('');
+		}
+
+		let pre = input[0] === '(' ? '(' : '';
+		let post = input[input.length - 1] === ')' ? ')': '';
+
+		return `${pre}${input
+			.substring(pre.length, input.length - post.length)
+			.split(/, ?/)
+			.map((part) => part
+				.split(' ')
+				.map((part) => /[a-z]/i.test(part) ? this._dbCasePart(part, quote) : part)
+				.join(' '))
+			.join(', ')}${post}`;
+
+	}
+
 	select(keys = ['*']) {
 		if (typeof keys !== 'string' || keys[0] !== ':') {
 			if (!Array.isArray(keys)) {
@@ -218,7 +244,7 @@ export default class QueryBuilder extends CustomPromise {
 	first(key, options = { select: true }) {
 		this._limit = 1;
 		if (key) {
-			if (options.select) this.select(key);
+			if (options.select) this.select(`${this._table}.${key}`);
 			this._first = key;
 		}
 		else this._first = true;