pqb 0.46.1 → 0.46.3

package/dist/index.mjs

@@ -414,7 +414,7 @@ class ColumnType extends ColumnTypeBase {
    */
   generated(...args) {
     const sql = raw(...args);
-    return setColumnData(this, "generated", {
+    const column = setColumnData(this, "generated", {
       toSQL(ctx, quoted) {
         return sql.toSQL(ctx, quoted);
       },
@@ -429,6 +429,8 @@ class ColumnType extends ColumnTypeBase {
         return sql2;
       }
     });
+    column.data.readonly = true;
+    return column;
   }
 }
 
@@ -1526,7 +1528,7 @@ class TsVectorColumn extends ColumnType {
       let sql;
       if (Array.isArray(target)) {
         const columns = target.length === 1 ? `"${snakeCase ? toSnakeCase(target[0]) : target[0]}"` : target.map(
-          (column) => `coalesce("${snakeCase ? toSnakeCase(column) : column}", '')`
+          (column2) => `coalesce("${snakeCase ? toSnakeCase(column2) : column2}", '')`
         ).join(` || ' ' || `);
         sql = `to_tsvector('${language}', ${columns})`;
       } else {
@@ -1564,10 +1566,12 @@ class TsVectorColumn extends ColumnType {
       }
       return code + ")";
     };
-    return setColumnData(this, "generated", {
+    const column = setColumnData(this, "generated", {
       toSQL,
       toCode
     });
+    column.data.readonly = true;
+    return column;
   }
 }
 class TsQueryColumn extends ColumnType {
@@ -2048,7 +2052,8 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
   const table = column.slice(0, index);
   const key = column.slice(index + 1);
   if (key === "*") {
-    return data.joinedShapes?.[table] ? select ? `row_to_json("${table}".*)` : `"${table}".*` : column;
+    const shape2 = data.joinedShapes?.[table];
+    return shape2 ? select ? makeRowToJson(table, shape2, true) : `"${table}".*` : column;
   }
   const tableName = data.aliases?.[table] || table;
   const quoted = `"${table}"`;
@@ -2064,7 +2069,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
   }
   return `"${tableName}"."${key}"`;
 };
-const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
+const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
   const index = column.indexOf(".");
   return index !== -1 ? tableColumnToSqlWithAs(
     ctx,
@@ -2073,26 +2078,18 @@ const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
     column.slice(0, index),
     column.slice(index + 1),
     as,
-    quotedAs) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select);
+    quotedAs,
+    select,
+    jsonList
+  ) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select, jsonList);
 };
-const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select) => {
+const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select, jsonList) => {
   if (key === "*") {
+    if (jsonList) jsonList[as] = void 0;
     const shape = data.joinedShapes?.[table];
     if (shape) {
       {
-        let isSimple = true;
-        const list = [];
-        for (const key2 in shape) {
-          const column2 = shape[key2];
-          if (column2.data.explicitSelect || column2 instanceof VirtualColumn) {
-            continue;
-          }
-          if (column2.data.name) {
-            isSimple = false;
-          }
-          list.push(`'${key2}'`, `"${table}"."${column2.data.name || key2}"`);
-        }
-        return (isSimple ? `row_to_json("${table}".*)` : "json_build_object(" + list.join(", ") + ")") + ` "${as}"`;
+        return makeRowToJson(table, shape, true) + ` "${as}"`;
       }
     }
     return column;
@@ -2114,12 +2111,10 @@ 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) => {
-  if (!select && data.joinedShapes?.[column]) {
-    return select ? `row_to_json("${column}".*) "${as}"` : `"${column}".r "${as}"`;
-  }
+const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
   const col = data.shape[column];
   if (col) {
     if (col.data.name && col.data.name !== column) {
@@ -2135,6 +2130,7 @@ const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
       )} "${as}"`;
     }
   }
+  if (jsonList) jsonList[as] = col;
   return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
 };
 const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
@@ -2143,6 +2139,23 @@ const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select)
 const quoteSchemaAndTable = (schema, table) => {
   return schema ? `"${schema}"."${table}"` : `"${table}"`;
 };
+const makeRowToJson = (table, shape, aliasName) => {
+  let isSimple = true;
+  const list = [];
+  for (const key in shape) {
+    const column = shape[key];
+    if (column.data.explicitSelect || column instanceof VirtualColumn) {
+      continue;
+    }
+    if (aliasName && column.data.name || column.data.jsonCast) {
+      isSimple = false;
+    }
+    list.push(
+      `'${key}', "${table}"."${aliasName && column.data.name || key}"${column.data.jsonCast ? `::${column.data.jsonCast}` : ""}`
+    );
+  }
+  return isSimple ? `row_to_json("${table}".*)` : "json_build_object(" + list.join(", ") + ")";
+};
 
 const queryTypeWithLimitOne = {
   one: true,
@@ -2498,6 +2511,7 @@ class NumberAsStringBaseColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.operators = Operators.number;
+    this.data.jsonCast = "text";
   }
 }
 class DecimalColumn extends NumberAsStringBaseColumn {
@@ -3057,6 +3071,7 @@ const applyComputedColumns = (q, fn) => {
       const data = (q.shape[key] = item.result.value || UnknownColumn.instance).data;
       data.computed = item;
       data.explicitSelect = true;
+      data.readonly = true;
     }
   }
   q.computeAtRuntime = q.computeBatchAtRuntime = void 0;
@@ -4409,15 +4424,53 @@ function cloneQueryBaseUnscoped(query) {
   return q;
 }
 
+class RowToJsonExpression extends Expression {
+  constructor(from, one, coalesce) {
+    super();
+    this.from = from;
+    this.one = one;
+    this.coalesce = coalesce;
+    this.result = { value: UnknownColumn.instance };
+    this.q = { expr: this };
+  }
+  makeSQL(ctx) {
+    const q = this.from;
+    const aliases = [];
+    const jsonList = {};
+    const select = selectToSql(
+      ctx,
+      q,
+      q.q,
+      `"${getQueryAs(q)}"`,
+      q.q.hookSelect,
+      aliases,
+      void 0,
+      jsonList
+    );
+    q.q.selectCache = { sql: select, aliases };
+    let rowToJson;
+    if (Object.values(jsonList).some((x) => x?.data.jsonCast)) {
+      rowToJson = `json_build_object(${Object.entries(jsonList).map(
+        ([key, column]) => `'${key}', t.${key}${column?.data.jsonCast ? `::${column.data.jsonCast}` : ""}`
+      ).join(", ")})`;
+    } else {
+      rowToJson = "row_to_json(t.*)";
+    }
+    return this.one ? rowToJson : this.coalesce !== false ? `COALESCE(json_agg(${rowToJson}), '[]')` : `json_agg(${rowToJson})`;
+  }
+}
 function queryJson(self, coalesce) {
+  const inner = self.clone();
   const q = queryWrap(
-    self,
+    inner,
     cloneQueryBaseUnscoped(self)
   );
   _queryGetOptional(
     q,
-    new RawSQL(
-      queryTypeWithLimitOne[self.q.returnType] ? `row_to_json("t".*)` : coalesce !== false ? `COALESCE(json_agg(row_to_json("t".*)), '[]')` : 'json_agg(row_to_json("t".*))'
+    new RowToJsonExpression(
+      inner,
+      queryTypeWithLimitOne[self.q.returnType],
+      coalesce
     )
   );
   q.q.returnsOne = true;
@@ -4724,17 +4777,22 @@ const makeReturningSql = (ctx, q, data, quotedAs, hookSelectI, addHookSelectI) =
 };
 
 const pushSelectSql = (ctx, table, query, quotedAs, aliases) => {
-  const sql = selectToSql(
-    ctx,
-    table,
-    query,
-    quotedAs,
-    query.hookSelect,
-    aliases
-  );
-  if (sql) ctx.sql.push(sql);
+  if (query.selectCache) {
+    ctx.sql.push(query.selectCache.sql);
+    if (aliases) aliases.push(...query.selectCache.aliases);
+  } else {
+    const sql = selectToSql(
+      ctx,
+      table,
+      query,
+      quotedAs,
+      query.hookSelect,
+      aliases
+    );
+    if (sql) ctx.sql.push(sql);
+  }
 };
-const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect, aliases, skipCTE) => {
+const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect, aliases, skipCTE, jsonList) => {
   if (query.inCTE && !skipCTE) {
     const { select } = makeReturningSql(
       ctx,
@@ -4757,13 +4815,15 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
               selected[key] = quotedAs;
             }
           }
-          sql = selectAllSql(query, quotedAs);
+          sql = selectAllSql(query, quotedAs, jsonList);
         } else {
           const index = item.indexOf(".");
           if (index !== -1) {
             const tableName = item.slice(0, index);
             const key = item.slice(index + 1);
-            if (hookSelect?.get(key)) (selected ?? (selected = {}))[key] = `"${tableName}"`;
+            if (hookSelect?.get(key)) {
+              (selected ?? (selected = {}))[key] = `"${tableName}"`;
+            }
             sql = tableColumnToSqlWithAs(
               ctx,
               table.q,
@@ -4771,7 +4831,10 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
               tableName,
               key,
               key === "*" ? tableName : key,
-              quotedAs);
+              quotedAs,
+              true,
+              jsonList
+            );
           } else {
             if (hookSelect?.get(item)) (selected ?? (selected = {}))[item] = quotedAs;
             sql = ownColumnToSqlWithAs(
@@ -4780,7 +4843,8 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
               item,
               item,
               quotedAs,
-              true
+              true,
+              jsonList
             );
           }
         }
@@ -4795,9 +4859,15 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
             if (typeof value === "object") {
               if (isExpression(value)) {
                 list.push(`${value.toSQL(ctx, quotedAs)} "${as}"`);
+                if (jsonList) {
+                  jsonList[as] = value.result.value;
+                }
                 aliases?.push(as);
               } else {
-                pushSubQuerySql(ctx, value, as, list, quotedAs, aliases);
+                pushSubQuerySql(ctx, query, value, as, list, quotedAs, aliases);
+                if (jsonList) {
+                  jsonList[as] = value.q.returnType === "value" || value.q.returnType === "valueOrThrow" ? value.q.expr?.result.value || value.result?.value : void 0;
+                }
               }
             } else if (value) {
               list.push(
@@ -4807,7 +4877,8 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
                   value,
                   as,
                   quotedAs,
-                  true
+                  true,
+                  jsonList
                 )
               );
               aliases?.push(as);
@@ -4841,32 +4912,39 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         col = query.shape[select];
         sql = simpleColumnToSQL(ctx, query, select, col, quotedAs);
       }
+      let name = columnName;
       if (selected?.[columnName]) {
         if (selected?.[columnName] === quotedTable) {
           hookSelect.delete(column);
           continue;
         }
         let i = 2;
-        let name;
         while (selected[name = `${column}${i}`]) i++;
         item.as = name;
         sql += ` "${name}"`;
       } else if (col?.data.name) {
         sql += ` "${columnName}"`;
       }
+      if (jsonList) jsonList[name] = col;
       list.push(sql);
     }
   }
-  return list.length ? list.join(", ") : query.select ? "" : selectAllSql(query, quotedAs);
+  return list.length ? list.join(", ") : query.select ? "" : selectAllSql(query, quotedAs, jsonList);
 };
 function selectedObjectToSQL(ctx, quotedAs, item) {
   const sql = item.toSQL(ctx, quotedAs);
   return ctx.aliasValue ? `${sql} r` : sql;
 }
-const selectAllSql = (query, quotedAs) => {
+const selectAllSql = (query, quotedAs, jsonList) => {
+  if (jsonList) {
+    Object.assign(
+      jsonList,
+      query.selectAllKeys || query.shape
+    );
+  }
   return query.join?.length ? query.selectAllColumns?.map((item) => `${quotedAs}.${item}`).join(", ") || `${quotedAs}.*` : query.selectAllColumns?.join(", ") || "*";
 };
-const pushSubQuerySql = (ctx, query, as, list, quotedAs, aliases) => {
+const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) => {
   const { returnType = "all" } = query.q;
   if (isQueryNone(query)) {
     let sql;
@@ -4899,9 +4977,12 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs, aliases) => {
     let sql;
     switch (returnType) {
       case "one":
-      case "oneOrThrow":
-        sql = `row_to_json("${query.q.joinedForSelect}".*)`;
+      case "oneOrThrow": {
+        const table = query.q.joinedForSelect;
+        const shape = mainQuery.joinedShapes?.[as];
+        sql = makeRowToJson(table, shape, false);
         break;
+      }
       case "all":
       case "pluck":
       case "value":
@@ -5409,6 +5490,7 @@ const makeSQL = (table, options) => {
   const values = options?.values || [];
   const ctx = {
     queryBuilder: table.queryBuilder,
+    q: query,
     sql,
     values,
     aliasValue: options?.aliasValue
@@ -8190,7 +8272,7 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
           item[key]
         );
       }
-      if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.computed || shape === anyShape) && item[key] !== void 0) {
+      if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.readonly || shape === anyShape) && item[key] !== void 0) {
         ctx.columns.set(key, ctx.columns.size);
         encoders[key] = shape[key]?.data.encode;
       }
@@ -10460,7 +10542,7 @@ const _queryUpdate = (query, arg) => {
     if (item instanceof VirtualColumn && item.update) {
       item.update(query, ctx, set);
       delete set[key];
-    } else if ((!shape[key] || shape[key].data.computed) && shape !== anyShape) {
+    } else if ((!shape[key] || shape[key].data.readonly) && shape !== anyShape) {
       delete set[key];
     } else {
       let value = set[key];
@@ -12799,6 +12881,7 @@ const performQuery = async (q, args, method) => {
     sql = {
       text: templateLiteralToSQL(args, {
         queryBuilder: q.queryBuilder,
+        q: q.q,
         sql: [],
         values
       }),