pqb 0.11.15 → 0.11.17

package/dist/index.d.ts

@@ -322,6 +322,7 @@ type CommonQueryData = {
     joinTo?: QueryBase;
     joinedShapes?: JoinedShapes;
     joinedParsers?: JoinedParsers;
+    joinedForSelect?: string;
     schema?: string;
     select?: SelectItem[];
     as?: string;

package/dist/index.js

@@ -160,7 +160,7 @@ const getJoinedColumnName = (data, shape, table, key, isOwnColumn) => {
   var _a, _b, _c;
   return (_c = (isOwnColumn ? shape[key] : void 0) || ((_b = (_a = data.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[key])) == null ? void 0 : _c.data.name;
 };
-const revealColumnToSql = (data, shape, column, quotedAs) => {
+const revealColumnToSql = (data, shape, column, quotedAs, select) => {
   var _a, _b;
   const index = column.indexOf(".");
   if (index !== -1) {
@@ -171,14 +171,14 @@ const revealColumnToSql = (data, shape, column, quotedAs) => {
       getJoinedColumnName(data, shape, table, key, quoted === quotedAs) || key
     )}`;
   } else if ((_a = data.joinedShapes) == null ? void 0 : _a[column]) {
-    return `row_to_json("${column}".*)`;
+    return select ? `row_to_json("${column}".*)` : `"${column}".r`;
   } else if (quotedAs && shape[column]) {
     return `${quotedAs}.${q(shape[column].data.name || column)}`;
   } else {
     return q(((_b = shape[column]) == null ? void 0 : _b.data.name) || column);
   }
 };
-const revealColumnToSqlWithAs = (data, column, quotedAs) => {
+const revealColumnToSqlWithAs = (data, column, quotedAs, select) => {
   var _a, _b;
   const index = column.indexOf(".");
   if (index !== -1) {
@@ -194,14 +194,14 @@ const revealColumnToSqlWithAs = (data, column, quotedAs) => {
     );
     return `${quoted}.${q(name || key)}${name && name !== key ? ` AS ${q(key)}` : ""}`;
   } else if ((_a = data.joinedShapes) == null ? void 0 : _a[column]) {
-    return `row_to_json("${column}".*) "${column}"`;
+    return select ? `row_to_json("${column}".*) "${column}"` : `"${column}".r "${column}"`;
   } else {
     const name = (_b = data.shape[column]) == null ? void 0 : _b.data.name;
     return `${quotedAs ? `${quotedAs}.` : ""}${q(name || column)}${name && name !== column ? ` AS ${q(column)}` : ""}`;
   }
 };
-const rawOrRevealColumnToSql = (data, expr, values, quotedAs, shape = data.shape) => {
-  return typeof expr === "string" ? revealColumnToSql(data, shape, expr, quotedAs) : getRaw(expr, values);
+const rawOrRevealColumnToSql = (data, expr, values, quotedAs, shape = data.shape, select) => {
+  return typeof expr === "string" ? revealColumnToSql(data, shape, expr, quotedAs, select) : getRaw(expr, values);
 };
 const quoteSchemaAndTable = (schema, table) => {
   return schema ? `${q(schema)}.${q(table)}` : q(table);
@@ -2320,7 +2320,7 @@ const selectToSql = (ctx, table, query, quotedAs) => {
     for (const item of query.select) {
       if (typeof item === "string") {
         list.push(
-          item === "*" ? selectAllSql(table, query, quotedAs) : revealColumnToSqlWithAs(table.query, item, quotedAs)
+          item === "*" ? selectAllSql(table, query, quotedAs) : revealColumnToSqlWithAs(table.query, item, quotedAs, true)
         );
       } else {
         if ("selectAs" in item) {
@@ -2339,7 +2339,8 @@ const selectToSql = (ctx, table, query, quotedAs) => {
                   table.query,
                   table.query.shape,
                   value,
-                  quotedAs
+                  quotedAs,
+                  true
                 )} AS ${q(as)}`
               );
             }
@@ -2383,14 +2384,14 @@ const pushSubQuerySql = (query, as, values, list) => {
     switch (returnType) {
       case "one":
       case "oneOrThrow":
-        sql = `row_to_json("${getQueryAs(query)}".*)`;
+        sql = `row_to_json("${query.query.joinedForSelect}".*)`;
         break;
       case "all":
       case "pluck":
       case "value":
       case "valueOrThrow":
       case "rows":
-        sql = `"${getQueryAs(query)}".r`;
+        sql = `"${query.query.joinedForSelect}".r`;
         break;
       case "rowCount":
       case "void":
@@ -3854,7 +3855,7 @@ const _joinLateral = (q, type, arg, cb, as) => {
   if (relation) {
     result = relation.joinQuery(q, result);
   }
-  const joinKey = result.query.as || result.table;
+  const joinKey = as || result.query.as || result.table;
   if (joinKey) {
     const shape = getShapeFromSelect(result, true);
     setQueryObjectValue(q, "joinedShapes", joinKey, shape);
@@ -3970,9 +3971,8 @@ const processSelectArg = (q, as, arg, columnAs) => {
       value = value(q);
       q.isSubQuery = isSubQuery;
       if (!orchidCore.isRaw(value) && value.joinQuery) {
-        value.query.as = key;
         value = value.joinQuery(q, value);
-        value.query.joinedForSelect = true;
+        value.query.joinedForSelect = key;
         let query;
         const returnType = value.query.returnType;
         if (!returnType || returnType === "all") {