pqb 0.71.2 → 0.71.4

package/dist/index.js

@@ -6589,7 +6589,8 @@ const tableColumnToSql = (ctx, queryData, shape, table, key, quotedAs, select, a
 	} else {
 		const tableName = _getQueryAliasOrName(queryData, table);
 		const quoted = `"${table}"`;
-		const col = quoted === quotedAs ? shape[key] : queryData.joinedShapes?.[tableName]?.[key];
+		const joined = queryData.joinedShapes?.[tableName];
+		const col = joined ? joined[key] : quoted === quotedAs ? shape[key] : void 0;
 		if (jsonList && as) jsonList[as] = col && getSelectedColumnData(col);
 		if (col?.data.selectSql) sql = `(${col.data.selectSql.toSQL(ctx, quoted)})`;
 		else if (col?.data.name) sql = `"${tableName}"."${col.data.name}"`;
@@ -10069,7 +10070,16 @@ const _joinLateral = (self, type, joinQuery, as, innerJoinLateral) => {
 		const joinedAs = getQueryAs(query);
 		setObjectValueImmutable(joinQuery.q, "joinedShapes", joinedAs, query.q.selectShape);
 	}
-	const shape = joinQuery.table && joinQuery.q.joinedShapes?.[joinQuery.table] || joinQuery.q.joinedShapes?.[joinAs] || getShapeFromSelect(joinQuery, true);
+	const joinedShapeMayHaveNames = joinQuery.table && joinQuery.q.joinedShapes?.[joinQuery.table] || joinQuery.q.joinedShapes?.[joinAs];
+	let joinedShape;
+	if (joinedShapeMayHaveNames) {
+		joinedShape = {};
+		for (const key in joinedShapeMayHaveNames) {
+			const column = joinedShapeMayHaveNames[key];
+			joinedShape[key] = column.data.name ? setColumnData(column, "name", void 0) : column;
+		}
+	}
+	const shape = joinedShape || getShapeFromSelect(joinQuery, true);
 	setObjectValueImmutable(query.q, "joinedShapes", joinAs, shape);
 	if (joinValue) setObjectValueImmutable(query.q, "valuesJoinedAs", joinAs, joinValueAs);
 	setObjectValueImmutable(query.q, "joinedParsers", joinValueAs || joinAs, getQueryParsers(joinQuery));
@@ -11097,7 +11107,7 @@ const selectColumn = (query, q, key, columnAs, columnAlias) => {
 };
 const getShapeFromSelect = (q, isSubQuery) => {
 	const query = q.q;
-	const { selectShape: shape } = query;
+	const { selectShape } = query;
 	let select;
 	if (query.selectedComputeds) {
 		select = query.select ? [...query.select] : [];
@@ -11107,18 +11117,18 @@ const getShapeFromSelect = (q, isSubQuery) => {
 	if (!select) if (query.type) result = {};
 	else if (isSubQuery) {
 		result = {};
-		for (const key in shape) {
-			const column = shape[key];
+		for (const key in selectShape) {
+			const column = selectShape[key];
 			if (!column.data.explicitSelect) result[key] = column.data.name ? setColumnData(column, "name", void 0) : column;
 		}
-	} else result = shape;
+	} else result = selectShape;
 	else {
 		result = {};
-		for (const item of select) if (typeof item === "string") addColumnToShapeFromSelect(q, item, shape, query, result, isSubQuery);
+		for (const item of select) if (typeof item === "string") addColumnToShapeFromSelect(q, item, selectShape, query, result, isSubQuery);
 		else if (isExpression(item)) result.value = item.result.value;
 		else if (item && "selectAs" in item) for (const key in item.selectAs) {
 			const it = item.selectAs[key];
-			if (typeof it === "string") addColumnToShapeFromSelect(q, it, shape, query, result, isSubQuery, key);
+			if (typeof it === "string") addColumnToShapeFromSelect(q, it, selectShape, query, result, isSubQuery, key);
 			else if (isExpression(it)) result[key] = it.result.value || UnknownColumn.instance;
 			else if (it) {
 				const { returnType } = it.q;
@@ -12407,6 +12417,10 @@ var QueryExpressions = class {
 			if (table === as) column = selectShape[col];
 			else column = q.q.joinedShapes?.[table][col];
 		} else column = selectShape[arg];
+		q.q.batchParsers = void 0;
+		q.q.transform = void 0;
+		q.q.hookSelect = void 0;
+		q.q.returnType = void 0;
 		return new RefExpression(column || UnknownColumn.instance, q, arg);
 	}
 	val(value) {