pqb 0.52.2 → 0.53.0

package/dist/index.js

@@ -4,6 +4,7 @@ var orchidCore = require('orchid-core');
 var pg = require('pg');
 var node_util = require('node:util');
 var node_async_hooks = require('node:async_hooks');
+var pqb = require('pqb');
 
 const used = [];
 const literalValues = [];
@@ -495,7 +496,7 @@ const columnsShapeToCode = (ctx, shape) => {
     if (name === key) column.data.name = void 0;
     code.push(
       ...combineCodeElements([
-        `${orchidCore.quoteObjectKey(key)}: `,
+        `${orchidCore.quoteObjectKey(key, ctx.snakeCase)}: `,
         ...orchidCore.toArray(shape[key].toCode(ctx, key)),
         ","
       ])
@@ -2146,7 +2147,7 @@ class TsVectorColumn extends ColumnType {
         const pairs = [];
         for (const key in target) {
           pairs.push(
-            `${orchidCore.quoteObjectKey(key)}: '${target[key]}'`
+            `${orchidCore.quoteObjectKey(key, false)}: '${target[key]}'`
           );
         }
         code += `{ ${pairs.join(", ")} }`;
@@ -2658,8 +2659,8 @@ const _join = (query, require, type, first, args) => {
     joinKey = first;
     const relation = query.relations[joinKey];
     if (relation) {
-      shape = getShapeFromSelect(relation.relationConfig.query);
-      const r = relation.relationConfig.query;
+      shape = getShapeFromSelect(relation.query);
+      const r = relation.query;
       parsers = r.q.parsers;
       batchParsers = r.q.batchParsers;
       computeds = r.q.computeds;
@@ -2748,11 +2749,11 @@ const _joinLateralProcessArg = (q, arg, cb) => {
   if (typeof arg === "string") {
     relation = q.relations[arg];
     if (relation) {
-      arg = _clone(relation.relationConfig.query);
+      arg = _clone(relation.query);
     } else {
       const w = q.q.withShapes?.[arg];
       if (w) {
-        const t = Object.create(q.queryBuilder);
+        const t = Object.create(q.qb);
         t.table = arg;
         t.shape = w.shape;
         t.computeds = w.computeds;
@@ -2770,7 +2771,7 @@ const _joinLateralProcessArg = (q, arg, cb) => {
     cb
   );
   if (relation) {
-    result = relation.relationConfig.joinQuery(
+    result = relation.joinQuery(
       result,
       q
     );
@@ -3575,7 +3576,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     if (query.transform) {
       result = orchidCore.applyTransforms(query, returnType, query.transform, result);
     }
-    return resolve?.(result);
+    return resolve ? resolve(result) : result;
   } catch (err) {
     let error;
     if (err instanceof pg.DatabaseError) {
@@ -3881,7 +3882,7 @@ function queryFrom(self, arg) {
   if (typeof arg === "string") {
     data.as || (data.as = arg);
     const w = data.withShapes?.[arg];
-    data.shape = w?.shape ?? orchidCore.emptyObject;
+    data.shape = w?.shape ?? anyShape;
     data.computeds = w?.computeds;
   } else if (orchidCore.isExpression(arg)) {
     data.as || (data.as = "t");
@@ -4664,17 +4665,19 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
   let values = query.values;
   if (quotedColumns.length === 0) {
     const key = Object.keys(q.shape)[0];
-    const column = q.shape[key];
-    quotedColumns[0] = `"${column?.data.name || key}"`;
-    if (Array.isArray(values) && Array.isArray(values[0])) {
-      values = values.map(() => [void 0]);
+    if (key) {
+      const column = q.shape[key];
+      quotedColumns[0] = `"${column?.data.name || key}"`;
+      if (Array.isArray(values) && Array.isArray(values[0])) {
+        values = values.map(() => [void 0]);
+      }
     }
   }
   ctx.sql.push(
-    `INSERT INTO ${quotedAs}(${quotedColumns.join(", ")})`,
+    `INSERT INTO ${quotedAs}${quotedColumns.length ? "(" + quotedColumns.join(", ") + ")" : ""}`,
     null
   );
-  const QueryClass = ctx.queryBuilder.constructor;
+  const QueryClass = ctx.qb.constructor;
   if (query.onConflict) {
     ctx.sql.push("ON CONFLICT");
     const { target } = query.onConflict;
@@ -5480,7 +5483,10 @@ const getTsVector = (ctx, data, lang, source, quotedAs) => {
 };
 
 const pushUpdateSql = (ctx, table, query, quotedAs) => {
-  const quotedTable = quoteSchemaAndTable(query.schema, table.table);
+  const quotedTable = quoteSchemaAndTable(
+    query.schema,
+    table.table || query.from
+  );
   const set = [];
   processData(ctx, table, set, query.updateData, quotedAs);
   if (!set.length) {
@@ -5524,7 +5530,7 @@ const pushUpdateReturning = (ctx, table, query, quotedAs, keyword) => {
 };
 const processData = (ctx, table, set, data, quotedAs) => {
   let append;
-  const QueryClass = ctx.queryBuilder.constructor;
+  const QueryClass = ctx.qb.constructor;
   for (const item of data) {
     if (typeof item === "function") {
       const result = item(data);
@@ -5570,7 +5576,7 @@ const processValue = (ctx, table, QueryClass, key, value, quotedAs) => {
 };
 
 const pushDeleteSql = (ctx, table, query, quotedAs) => {
-  const from = `"${table.table}"`;
+  const from = `"${table.table || query.from}"`;
   ctx.sql.push(`DELETE FROM ${from}`);
   if (from !== quotedAs) {
     ctx.sql.push(quotedAs);
@@ -5678,7 +5684,7 @@ const toSQL = (table, options) => {
   const sql = [];
   const values = options?.values || [];
   const ctx = {
-    queryBuilder: table.queryBuilder,
+    qb: table.qb,
     q: query,
     sql,
     values,
@@ -5998,7 +6004,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
             throw new Error(`Unknown column ${key} provided to condition`);
           }
         }
-        if (value instanceof ctx.queryBuilder.constructor) {
+        if (value instanceof ctx.qb.constructor) {
           ands.push(
             `${quotedColumn} = (${getSqlText(value.toSQL(ctx))})`
           );
@@ -6278,7 +6284,7 @@ const getIsJoinSubQuery = (query) => {
 const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
   if (typeof first === "string") {
     if (first in joinTo.relations) {
-      const { query: toQuery, joinQuery } = joinTo.relations[first].relationConfig;
+      const { query: toQuery, joinQuery } = joinTo.relations[first];
       const j = joinQuery(toQuery, joinTo);
       if (typeof args[0] === "function") {
         const r = args[0](
@@ -6299,7 +6305,7 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
       if (!w) {
         throw new Error("Cannot find a `with` statement");
       }
-      const j = joinTo.queryBuilder.baseQuery.clone();
+      const j = joinTo.qb.baseQuery.clone();
       j.table = first;
       j.q = {
         shape: w.shape,
@@ -6378,7 +6384,9 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
 };
 const preprocessJoinArg = (q, arg) => {
   if (typeof arg !== "function") return arg;
-  arg = arg(q.relations);
+  arg = arg(
+    q.relationQueries
+  );
   arg.joinQueryAfterCallback = arg.joinQuery;
   return arg;
 };
@@ -7198,9 +7206,9 @@ const _chain = (fromQuery, toQuery, rel) => {
     q.returnType = q.returnsOne = q.limit = void 0;
   }
   if (self.q.relChain) {
-    q.relChain = [...self.q.relChain, self];
+    q.relChain = [...self.q.relChain, { query: self, rel }];
   } else {
-    q.relChain = [self];
+    q.relChain = [{ query: self, rel }];
   }
   const aliases = self.q.as ? { ...self.q.aliases } : { ...self.q.aliases, [self.table]: self.table };
   const relAliases = q.aliases;
@@ -7237,7 +7245,7 @@ const resolveSubQueryCallbackV2 = (q, cb) => {
       for (const key in relations) {
         Object.defineProperty(base, key, {
           get() {
-            const rel = relations[key].relationConfig;
+            const rel = relations[key];
             const relQuery = _clone(rel.query);
             relQuery.q.withShapes = this.q.withShapes;
             return _chain(this, relQuery, rel);
@@ -7257,11 +7265,8 @@ const resolveSubQueryCallbackV2 = (q, cb) => {
   return cb(arg);
 };
 const joinSubQuery = (q, sub) => {
-  if (!("relationConfig" in sub)) return sub;
-  return sub.relationConfig.joinQuery(
-    sub,
-    q
-  );
+  if (!("joinQuery" in sub)) return sub;
+  return sub.joinQuery(sub, q);
 };
 
 const defaultSrid = 4326;
@@ -7489,6 +7494,7 @@ class VirtualColumn extends ColumnType {
     this.dataType = "";
     this.operators = Operators.any;
     this.data.explicitSelect = true;
+    this.data.insertable = this.data.updatable = false;
   }
   toCode() {
     throw new Error(`toCode is not implemented for virtual column`);
@@ -7500,6 +7506,7 @@ const _UnknownColumn = class _UnknownColumn extends VirtualColumn {
     super(schema, schema.unknown());
     this.selectable = true;
     this.data.explicitSelect = void 0;
+    this.data.insertable = this.data.updatable = true;
   }
 };
 _UnknownColumn.instance = new _UnknownColumn(defaultSchemaConfig);
@@ -7567,6 +7574,12 @@ const makeColumnsByType = (schema) => {
   };
 };
 
+const anyShape = new Proxy(orchidCore.emptyObject, {
+  get() {
+    return UnknownColumn.instance;
+  }
+});
+
 const { types } = pg;
 const defaultTypeParsers = {};
 for (const key in types.builtins) {
@@ -8427,14 +8440,7 @@ const createSelect = (q) => {
 const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
   const { shape } = q.q;
   for (const key in item) {
-    if (shape[key] instanceof VirtualColumn) {
-      shape[key].create?.(
-        q,
-        ctx,
-        item,
-        rowIndex
-      );
-    } else {
+    if (shape[key]?.data.insertable !== false) {
       if (typeof item[key] === "function") {
         item[key] = resolveSubQueryCallbackV2(
           q,
@@ -8445,6 +8451,13 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
         ctx.columns.set(key, ctx.columns.size);
         encoders[key] = shape[key]?.data.encode;
       }
+    } else if (shape[key] instanceof VirtualColumn) {
+      shape[key].create?.(
+        q,
+        ctx,
+        item,
+        rowIndex
+      );
     }
   }
 };
@@ -8657,7 +8670,7 @@ class Create {
    * `create` and `insert` can be used in {@link WithMethods.with} expressions:
    *
    * ```ts
-   * db.$queryBuilder
+   * db.$qb
    *   // create a record in one table
    *   .with('a', db.table.select('id').create(data))
    *   // create a record in other table using the first table record id
@@ -9196,7 +9209,7 @@ class Delete {
    * `delete` can be used in {@link WithMethods.with} expressions:
    *
    * ```ts
-   * db.$queryBuilder
+   * db.$qb
    *   // delete a record in one table
    *   .with('a', db.table.find(1).select('id').delete())
    *   // delete a record in other table using the first table record id
@@ -10604,7 +10617,7 @@ class WithMethods {
     let [options, queryArg] = third ? [second, third] : [void 0, second];
     let query;
     if (typeof queryArg === "function") {
-      const arg = q.queryBuilder.clone();
+      const arg = q.qb.clone();
       arg.q.withShapes = q.q.withShapes;
       query = queryArg(arg);
     } else {
@@ -10631,7 +10644,7 @@ class WithMethods {
     var _a;
     const q = _clone(this);
     let [options, baseFn, recursiveFn] = args.length === 2 ? [{}, args[0], args[1]] : args;
-    const arg = q.queryBuilder.clone();
+    const arg = q.qb.clone();
     arg.q.withShapes = q.q.withShapes;
     let query = typeof baseFn === "function" ? baseFn(arg) : baseFn;
     const shape = getShapeFromSelect(query, true);
@@ -10912,7 +10925,7 @@ class Update {
    * `update` can be used in {@link WithMethods.with} expressions:
    *
    * ```ts
-   * db.$queryBuilder
+   * db.$qb
    *   // update record in one table
    *   .with('a', db.table.find(1).select('id').update(data))
    *   // update record in other table using the first table record id
@@ -11374,12 +11387,12 @@ function orCreate(query, data, updateData, mergeData) {
       q2.q.inCTE = inCTE;
       const c = q2.create(data);
       c.q.select = q2.q.select;
-      let q22 = q2.queryBuilder.with("f", q2).with("c", c);
+      let q22 = q2.qb.with("f", q2).with("c", c);
       q22.q.returnsOne = true;
       queryFrom(q22, "f");
       q22 = _queryUnion(
         q22,
-        [q2.queryBuilder.from("c")],
+        [q2.qb.from("c")],
         "UNION ALL",
         true,
         true
@@ -12675,12 +12688,10 @@ class QueryMethods {
     return condition ? fn(this) : this;
   }
   queryRelated(relName, params) {
-    return this.relations[relName].relationConfig.queryRelated(
-      params
-    );
+    return this.relations[relName].queryRelated(params);
   }
   chain(relName) {
-    const rel = this.relations[relName].relationConfig;
+    const rel = this.relations[relName];
     return _chain(this, _clone(rel.query), rel);
   }
 }
@@ -12816,12 +12827,49 @@ const parseIndexOrExclude = (item) => {
   return item;
 };
 
-const anyShape = {};
+const performQuery = async (q, args, method) => {
+  const trx = q.internal.transactionStorage.getStore();
+  let sql;
+  if (orchidCore.isRawSQL(args[0])) {
+    const values = [];
+    sql = {
+      text: args[0].toSQL({ values }),
+      values
+    };
+  } else {
+    const values = [];
+    sql = {
+      text: pqb.templateLiteralToSQL(args, {
+        qb: q.qb,
+        q: q.q,
+        sql: [],
+        values
+      }),
+      values
+    };
+  }
+  const log = trx?.log ?? q.q.log;
+  let logData;
+  if (log) logData = log.beforeQuery(sql);
+  try {
+    const result = await (trx?.adapter || q.adapter)[method](
+      sql
+    );
+    if (log) log.afterQuery(sql, logData);
+    return result;
+  } catch (err) {
+    if (log) {
+      log.onError(err, sql, logData);
+    }
+    throw err;
+  }
+};
+
 class Db extends QueryMethods {
-  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = {}) {
+  constructor(adapter, qb, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = {}) {
     super();
     this.adapter = adapter;
-    this.queryBuilder = queryBuilder;
+    this.qb = qb;
     this.table = table;
     this.shape = shape;
     this.columnTypes = columnTypes;
@@ -12839,6 +12887,7 @@ class Db extends QueryMethods {
     };
     this.baseQuery = this;
     this.relations = {};
+    this.relationQueries = {};
     const logger = options.logger || console;
     const parsers = {};
     let hasParsers = false;
@@ -12997,11 +13046,54 @@ class Db extends QueryMethods {
    *
    * @param args - SQL template literal, or an object { raw: string, values?: unknown[] }
    */
-  query(...args) {
-    return performQuery(this, args, "query");
+  get query() {
+    const q = this;
+    let query = q._query;
+    if (!query) {
+      q._query = query = Object.assign(
+        (...args) => performQuery(q, args, "query"),
+        {
+          async records(...args) {
+            const { rows } = await performQuery(q, args, "query");
+            return rows;
+          },
+          async take(...args) {
+            const {
+              rows: [row]
+            } = await performQuery(q, args, "query");
+            if (!row) throw new NotFoundError(q);
+            return row;
+          },
+          async takeOptional(...args) {
+            const { rows } = await performQuery(q, args, "query");
+            return rows[0];
+          },
+          async rows(...args) {
+            const { rows } = await performQuery(q, args, "arrays");
+            return rows;
+          },
+          async pluck(...args) {
+            const { rows } = await performQuery(q, args, "arrays");
+            return rows.map((row) => row[0]);
+          },
+          async get(...args) {
+            const {
+              rows: [row]
+            } = await performQuery(q, args, "arrays");
+            if (!row) throw new NotFoundError(q);
+            return row[0];
+          },
+          async getOptional(...args) {
+            const { rows } = await performQuery(q, args, "arrays");
+            return rows[0]?.[0];
+          }
+        }
+      );
+    }
+    return query;
   }
   /**
-   * The same as the {@link query}, but returns an array of arrays instead of objects:
+   * Performs a SQL query, returns a db result with array of arrays instead of objects:
    *
    * ```ts
    * const value = 1;
@@ -13036,43 +13128,6 @@ class Db extends QueryMethods {
     return map.get(name);
   }
 }
-const performQuery = async (q, args, method) => {
-  const trx = q.internal.transactionStorage.getStore();
-  let sql;
-  if (orchidCore.isRawSQL(args[0])) {
-    const values = [];
-    sql = {
-      text: args[0].toSQL({ values }),
-      values
-    };
-  } else {
-    const values = [];
-    sql = {
-      text: templateLiteralToSQL(args, {
-        queryBuilder: q.queryBuilder,
-        q: q.q,
-        sql: [],
-        values
-      }),
-      values
-    };
-  }
-  const log = trx?.log ?? q.q.log;
-  let logData;
-  if (log) logData = log.beforeQuery(sql);
-  try {
-    const result = await (trx?.adapter || q.adapter)[method](
-      sql
-    );
-    if (log) log.afterQuery(sql, logData);
-    return result;
-  } catch (err) {
-    if (log) {
-      log.onError(err, sql, logData);
-    }
-    throw err;
-  }
-};
 orchidCore.applyMixins(Db, [QueryMethods]);
 Db.prototype.constructor = Db;
 const createDb = ({
@@ -13121,9 +13176,7 @@ const createDb = ({
     adapter,
     close: () => adapter.close()
   });
-  for (const name of Object.getOwnPropertyNames(Db.prototype)) {
-    db[name] = Db.prototype[name];
-  }
+  Object.setPrototypeOf(db, Db.prototype);
   db.sql = (...args) => {
     const sql = raw(...args);
     sql.columnTypes = ct;
@@ -13156,13 +13209,13 @@ const _initQueryBuilder = (adapter, columnTypes, transactionStorage, commonOptio
   }
   qb.internal.domains = options.domains;
   qb.internal.generatorIgnore = options.generatorIgnore;
-  return qb.queryBuilder = qb;
+  return qb.qb = qb;
 };
 
 class Rollback extends Error {
 }
 const trxForTest = Symbol("trxForTest");
-const argToDb = (arg) => "$queryBuilder" in arg ? arg.$queryBuilder : arg;
+const argToDb = (arg) => "$qb" in arg ? arg.$qb : arg;
 const testTransaction = {
   /**
    * Start a test transaction.