pqb 0.48.1 → 0.48.3

package/dist/index.d.ts

@@ -5512,7 +5512,9 @@ type SelectArg<T extends SelectSelf> = '*' | keyof T['meta']['selectable'];
 type SelectArgs<T extends SelectSelf> = ('*' | keyof T['meta']['selectable'])[];
 interface SelectAsArg<T extends SelectSelf> {
     [K: string]: keyof T['meta']['selectable'] | Expression | ((q: EmptyObject extends T['relations'] ? T : {
-        [K in keyof T['relations'] | keyof T]: K extends keyof T['relations'] ? T['relations'][K]['relationConfig']['maybeSingle'] : K extends keyof T ? T[K] : never;
+        [K in keyof T['relations'] | keyof T]: K extends keyof T['relations'] ? T['relations'][K]['relationConfig']['maybeSingle'] & {
+            withData: T['withData'];
+        } : K extends keyof T ? T[K] : never;
     }) => unknown);
 }
 type SelectAsFnReturnType = {

package/dist/index.js

@@ -2101,6 +2101,7 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
   const tableName = data.aliases?.[table] || table;
   const quoted = `"${table}"`;
   const col = quoted === quotedAs ? data.shape[key] : data.joinedShapes?.[tableName][key];
+  if (jsonList) jsonList[as] = col;
   if (col) {
     if (col.data.name && col.data.name !== key) {
       return `"${tableName}"."${col.data.name}" "${as}"`;
@@ -2115,11 +2116,11 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
       )} "${as}"`;
     }
   }
-  if (jsonList) jsonList[as] = col;
   return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
 };
 const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
   const col = data.shape[column];
+  if (jsonList) jsonList[as] = col;
   if (col) {
     if (col.data.name && col.data.name !== column) {
       return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
@@ -2134,7 +2135,6 @@ const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList)
       )} "${as}"`;
     }
   }
-  if (jsonList) jsonList[as] = col;
   return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
 };
 const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
@@ -5307,7 +5307,7 @@ const pushUpdateSql = (ctx, table, query, quotedAs) => {
   }
   ctx.sql.push(`UPDATE ${quotedTable}`);
   if (quotedTable !== quotedAs) {
-    ctx.sql.push(`AS ${quotedAs}`);
+    ctx.sql.push(quotedAs);
   }
   ctx.sql.push("SET");
   ctx.sql.push(set.join(", "));
@@ -5379,7 +5379,7 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
   const from = `"${table.table}"`;
   ctx.sql.push(`DELETE FROM ${from}`);
   if (from !== quotedAs) {
-    ctx.sql.push(`AS ${quotedAs}`);
+    ctx.sql.push(quotedAs);
   }
   let conditions;
   if (query.join?.length) {
@@ -5868,7 +5868,7 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
     const as = j.q.as;
     const joinAs = `"${as}"`;
     if (as !== tableName) {
-      target += ` AS ${joinAs}`;
+      target += ` ${joinAs}`;
     }
     if (r && s) {
       target = `LATERAL ${subJoinToSql(ctx, j, quotedTable, joinAs, true)}`;
@@ -5963,7 +5963,7 @@ const getArgQueryTarget = (ctx, first, joinSubQuery, cloned) => {
     let target = quotedFrom || quoteSchemaAndTable(joinQuery.schema, first.table);
     if (addAs) {
       joinAs = qAs;
-      target += ` AS ${qAs}`;
+      target += ` ${qAs}`;
     }
     return { target, joinAs };
   }
@@ -7034,7 +7034,9 @@ const resolveSubQueryCallbackV2 = (q, cb) => {
         Object.defineProperty(base, key, {
           get() {
             const rel = relations[key].relationConfig;
-            return _chain(this, _clone(rel.query), rel);
+            const relQuery = _clone(rel.query);
+            relQuery.q.withShapes = this.q.withShapes;
+            return _chain(this, relQuery, rel);
           }
         });
       }
@@ -12747,7 +12749,7 @@ class Db extends QueryMethods {
         const column = shape[key];
         if (!column.data.explicitSelect) {
           list.push(
-            column.data.name ? `"${column.data.name}" AS "${key}"` : `"${key}"`
+            column.data.name ? `"${column.data.name}" "${key}"` : `"${key}"`
           );
           keys[key] = column;
         }