@trenskow/pged 5.1.115 → 5.1.117

package/lib/query-builder.js

@@ -283,23 +283,34 @@ export default class QueryBuilder extends CustomPromise {
 			...options
 				.filter((options) => options)
 				.map((options) => {
+
 					if (typeof options !== 'object') throw new TypeError('Option must be an object');
+
 					if (!options.table) throw new SyntaxError('Missing table.');
+
+					if (typeof options.table === 'string') options.table = Object.fromEntries([[options.table, options.table]]);
+
+					const [, alias] = Object.entries(options.table)[0];
+
 					if (!options.conditions) {
 						options.conditions = {};
 						options.local = options.local || this._defaultPrimaryKey;
 						options.foreign = options.foreign || this._defaultPrimaryKey;
 						let local = options.local.substring(0, 1) == ':' ? this._dbCase(options.local) : `:${this._table}.${this._dbCase(options.local)}`;
 						let direct = local.substring(0, 1) == ':' ? ':' : '';
-						let foreign = options.foreign.substring(0, 1) == ':' ? `${direct}${this._dbCase(options.foreign.substring(1))}` : `${direct}${this._dbCase(options.table)}.${this._dbCase(options.foreign)}`;
+						let foreign = options.foreign.substring(0, 1) == ':' ? `${direct}${this._dbCase(options.foreign.substring(1))}` : `${direct}${this._dbCase(alias)}.${this._dbCase(options.foreign)}`;
 						options.conditions[local] = foreign;
 					}
+
 					options.conditions = this._formalizeConditions(options.conditions);
 					options.required = options.required || 'both';
+
 					if (!['none', 'local', 'foreign', 'both'].includes(options.required)) {
 						throw new TypeError('Only `none`, `local`, `foreign`, `both` are supported by `options.required`.');
 					}
+
 					return options;
+
 				}));
 		return this;
 	}
@@ -546,18 +557,28 @@ export default class QueryBuilder extends CustomPromise {
 
 	_buildJoins() {
 		return this._joins.map((join) => {
+			
+			const [table, alias] = Object.entries(join.table)[0];
+
+			const target = table !== alias ? `${this._dbCase(table)} as ${this._dbCase(alias)}` : this._dbCase(table);
+
 			if (join.conditions) {
+
 				let type;
+
 				switch (join.required) {
 				case 'both': type = 'join'; break;
 				case 'local': type = 'left join'; break;
 				case 'foreign': type = 'right join'; break;
 				case 'none': type = 'outer join'; break;
 				}
-				return `${type} ${this._dbCase(join.table)} on ${this._buildConditions(join.conditions)}`;
+
+				return `${type} ${target} on ${this._buildConditions(join.conditions)}`;
+
 			} else {
-				return `cross join ${this._dbCase(join.table)}`;
+				return `cross join ${target}`;
 			}
+
 		}).join(' ');
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@trenskow/pged",
-	"version": "5.1.115",
+	"version": "5.1.117",
 	"description": "Just a silly little db management and query builder for PostgreSQL.",
 	"main": "index.js",
 	"type": "module",
@@ -26,15 +26,15 @@
 		"@trenskow/async-event-emitter": "^0.1.97",
 		"@trenskow/caseit": "^1.4.21",
 		"@trenskow/custom-promise": "^0.13.18",
-		"@trenskow/parse": "^0.1.45",
-		"@trenskow/wait": "^1.3.92",
-		"pg": "^8.18.0",
+		"@trenskow/parse": "^0.1.46",
+		"@trenskow/wait": "^1.3.93",
+		"pg": "^8.20.0",
 		"puqeue": "^1.1.29"
 	},
 	"devDependencies": {
-		"@eslint/eslintrc": "^3.3.3",
+		"@eslint/eslintrc": "^3.3.5",
 		"@eslint/js": "^10.0.1",
-		"eslint": "^10.0.0",
-		"globals": "^17.3.0"
+		"eslint": "^10.1.0",
+		"globals": "^17.4.0"
 	}
 }