pqb 0.55.1 → 0.56.2

package/dist/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 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');
@@ -2749,6 +2748,7 @@ const processAnds = (and, ctx, table, query, quotedAs, parens) => {
   for (const data of and) {
     processWhere(ands, ctx, table, query, data, quotedAs);
   }
+  if (!ands.length) return;
   const sql = ands.join(" AND ");
   return parens && ands.length > 1 ? `(${sql})` : sql;
 };
@@ -2784,12 +2784,16 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     if (value === void 0) continue;
     if (key === "AND") {
       const arr = orchidCore.toArray(value);
-      ands.push(processAnds(arr, ctx, table, query, quotedAs));
+      const sql = processAnds(arr, ctx, table, query, quotedAs);
+      if (sql) ands.push(sql);
     } else if (key === "OR") {
       const arr = value.map(orchidCore.toArray);
-      ands.push(
-        `(${arr.map((and) => processAnds(and, ctx, table, query, quotedAs)).join(" OR ")})`
-      );
+      const sqls = arr.reduce((acc, and) => {
+        const sql = processAnds(and, ctx, table, query, quotedAs);
+        if (sql) acc.push(sql);
+        return acc;
+      }, []);
+      if (sqls.length) ands.push(`(${sqls.join(" OR ")})`);
     } else if (key === "NOT") {
       const arr = orchidCore.toArray(value);
       ands.push(`NOT ${processAnds(arr, ctx, table, query, quotedAs, true)}`);
@@ -3343,11 +3347,31 @@ const _queryWhere = (q, args) => {
   resolveCallbacksInArgs(q, args);
   return pushQueryArrayImmutable(q, "and", args);
 };
-const _queryFindBy = (q, args) => {
-  return _queryTake(_queryWhere(q, args));
+const _queryFindBy = (q, arg) => {
+  validateFindBy(q, arg, "findBy");
+  return _queryTake(_queryWhere(q, [arg]));
+};
+const _queryFindByOptional = (q, arg) => {
+  validateFindBy(q, arg, "findByOptional");
+  return _queryTakeOptional(_queryWhere(q, [arg]));
 };
-const _queryFindByOptional = (q, args) => {
-  return _queryTakeOptional(_queryWhere(q, args));
+const validateFindBy = (q, arg, method) => {
+  let nonEmpty;
+  for (const key in arg) {
+    nonEmpty = true;
+    if (arg[key] === void 0) {
+      throw new orchidCore.OrchidOrmInternalError(
+        q,
+        `${method} was called with undefined value`
+      );
+    }
+  }
+  if (!nonEmpty) {
+    throw new orchidCore.OrchidOrmInternalError(
+      q,
+      `${method} was called with empty object`
+    );
+  }
 };
 const _queryWhereSql = (q, args) => {
   return orchidCore.pushQueryValueImmutable(
@@ -4539,10 +4563,10 @@ class QueryLog {
   }
 }
 
-const commitSql$1 = {
+const commitSql = {
   text: "COMMIT"
 };
-const rollbackSql$1 = {
+const rollbackSql = {
   text: "ROLLBACK"
 };
 class AfterCommitError extends orchidCore.OrchidOrmError {
@@ -4591,7 +4615,7 @@ class Transaction {
     const transactionId = trx ? trx.transactionId + 1 : 0;
     const callback = (adapter) => {
       if (log) log.afterQuery(sql, logData);
-      if (log) logData = log.beforeQuery(commitSql$1);
+      if (log) logData = log.beforeQuery(commitSql);
       if (trx) {
         trx.transactionId = transactionId;
         return fn();
@@ -4606,13 +4630,29 @@ class Transaction {
       return this.internal.transactionStorage.run(trx, fn);
     };
     if (!trx) {
-      sql.text = `BEGIN${options.level ? ` ISOLATION LEVEL ${options.level}` : ""}${options.readOnly !== void 0 ? ` READ ${options.readOnly ? "ONLY" : "WRITE"}` : ""}${options.deferrable !== void 0 ? ` ${options.deferrable ? "" : "NOT "}DEFERRABLE` : ""}`;
-      if (log) logData = log.beforeQuery(sql);
-      const result = await this.q.adapter.transaction(sql, callback).catch((err) => {
-        if (log) log.afterQuery(rollbackSql$1, logData);
+      let beginOptions = void 0;
+      if (options.level) {
+        beginOptions = `ISOLATION LEVEL ${options.level}`;
+      }
+      if (options.readOnly !== void 0) {
+        const add = `READ ${options.readOnly ? "ONLY" : "WRITE"}`;
+        if (beginOptions) beginOptions += " " + add;
+        else beginOptions = add;
+      }
+      if (options.deferrable !== void 0) {
+        const add = `${options.deferrable ? "" : "NOT "}DEFERRABLE`;
+        if (beginOptions) beginOptions += " " + add;
+        else beginOptions = add;
+      }
+      if (log) {
+        sql.text = beginOptions ? `BEGIN ${beginOptions}` : "BEGIN";
+        logData = log.beforeQuery(sql);
+      }
+      const result = await this.q.adapter.transaction(beginOptions, callback).catch((err) => {
+        if (log) log.afterQuery(rollbackSql, logData);
         throw err;
       });
-      if (log) log.afterQuery(commitSql$1, logData);
+      if (log) log.afterQuery(commitSql, logData);
       runAfterCommit(trx.afterCommit, result);
       return result;
     } else {
@@ -4620,20 +4660,20 @@ class Transaction {
         sql.text = `SAVEPOINT "${transactionId}"`;
         if (log) logData = log.beforeQuery(sql);
         const { adapter } = trx;
-        await adapter.query(sql);
+        await adapter.arrays(sql.text, sql.values);
         let result;
         try {
           result = await callback(adapter);
         } catch (err) {
           sql.text = `ROLLBACK TO SAVEPOINT "${transactionId}"`;
           if (log) logData = log.beforeQuery(sql);
-          await adapter.query(sql);
+          await adapter.arrays(sql.text, sql.values);
           if (log) log.afterQuery(sql, logData);
           throw err;
         }
         sql.text = `RELEASE SAVEPOINT "${transactionId}"`;
         if (log) logData = log.beforeQuery(sql);
-        await adapter.query(sql);
+        await adapter.arrays(sql.text, sql.values);
         if (log) log.afterQuery(sql, logData);
         if (transactionId === trx.testTransactionCount) {
           const { afterCommit } = trx;
@@ -4978,25 +5018,10 @@ class Then {
   }
 }
 let queryError = void 0;
-let getThen;
-if (process.versions.bun) {
-  getThen = function() {
-    queryError = new Error();
-    if (!this.internal) return maybeWrappedThen;
-    const trx = this.internal.transactionStorage.getStore();
-    if (!trx) return maybeWrappedThen;
-    return (resolve, reject) => {
-      return this.internal.transactionStorage.run(trx, () => {
-        return maybeWrappedThen.call(this, resolve, reject);
-      });
-    };
-  };
-} else {
-  getThen = function() {
-    queryError = new Error();
-    return maybeWrappedThen;
-  };
-}
+const getThen = function() {
+  queryError = new Error();
+  return maybeWrappedThen;
+};
 Object.defineProperty(Then.prototype, "then", {
   configurable: true,
   get: getThen,
@@ -5106,32 +5131,37 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
       result = query.handleResult(q, tempReturnType, queryResult);
     } else {
       const queryMethod = queryMethodByReturnType[tempReturnType];
-      if (!trx) {
-        if (log) logData = log.beforeQuery(beginSql);
-        await adapter.arrays(beginSql);
-        if (log) log.afterQuery(beginSql, logData);
-      }
-      for (const item of sql.batch) {
-        sql = item;
-        if (log) {
-          logData = log.beforeQuery(sql);
-        }
-        const result2 = await execQuery(adapter, queryMethod, sql);
-        if (queryResult) {
-          queryResult.rowCount += result2.rowCount;
-          queryResult.rows.push(...result2.rows);
-        } else {
-          queryResult = result2;
-        }
-        if (log) {
-          log.afterQuery(sql, logData);
-          sql = void 0;
+      const queryBatch = async (batch) => {
+        for (const item of batch) {
+          sql = item;
+          if (log) {
+            logData = log.beforeQuery(sql);
+          }
+          const result2 = await execQuery(adapter, queryMethod, sql);
+          if (queryResult) {
+            queryResult.rowCount += result2.rowCount;
+            queryResult.rows.push(...result2.rows);
+          } else {
+            queryResult = result2;
+          }
+          if (log) {
+            log.afterQuery(sql, logData);
+          }
         }
-      }
-      if (!trx) {
-        if (log) logData = log.beforeQuery(commitSql$1);
-        await adapter.arrays(commitSql$1);
-        if (log) log.afterQuery(commitSql$1, logData);
+        sql = void 0;
+      };
+      if (trx) {
+        await queryBatch(sql.batch);
+      } else {
+        const { batch } = sql;
+        if (log) logData = log.beforeQuery(beginSql);
+        await adapter.transaction(void 0, async () => {
+          if (log) log.afterQuery(beginSql, logData);
+          const res = await queryBatch(batch);
+          if (log) logData = log.beforeQuery(commitSql);
+          return res;
+        });
+        if (log) log.afterQuery(commitSql, logData);
       }
       if (query.patchResult) {
         await query.patchResult(q, hookSelect, queryResult);
@@ -5284,9 +5314,9 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     return resolve ? resolve(result) : result;
   } catch (err) {
     let error;
-    if (err instanceof pg.DatabaseError) {
+    if (err instanceof adapter.errorClass) {
       error = new q.error();
-      assignError(error, err);
+      adapter.assignError(error, err);
       error.cause = localError;
     } else {
       error = err;
@@ -5312,37 +5342,13 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
   }
 };
 const execQuery = (adapter, method, sql) => {
-  return adapter[method](sql).then(
-    (result) => {
-      if (result.rowCount && !result.rows.length) {
-        result.rows.length = result.rowCount;
-        result.rows.fill({});
-      }
-      return result;
+  return adapter[method](sql.text, sql.values).then((result) => {
+    if (result.rowCount && !result.rows.length) {
+      result.rows.length = result.rowCount;
+      result.rows.fill({});
     }
-  );
-};
-const assignError = (to, from) => {
-  to.message = from.message;
-  to.length = from.length;
-  to.name = from.name;
-  to.severity = from.severity;
-  to.code = from.code;
-  to.detail = from.detail;
-  to.hint = from.hint;
-  to.position = from.position;
-  to.internalPosition = from.internalPosition;
-  to.internalQuery = from.internalQuery;
-  to.where = from.where;
-  to.schema = from.schema;
-  to.table = from.table;
-  to.column = from.column;
-  to.dataType = from.dataType;
-  to.constraint = from.constraint;
-  to.file = from.file;
-  to.line = from.line;
-  to.routine = from.routine;
-  return to;
+    return result;
+  });
 };
 const handleResult = (q, returnType, result, isSubQuery) => {
   const { parsers } = q.q;
@@ -5919,7 +5925,9 @@ const processSelectArg = (q, as, arg, columnAs) => {
           return false;
         }
       }
-      if (!orchidCore.isExpression(value) && orchidCore.isRelationQuery(value)) {
+      if (!orchidCore.isExpression(value) && orchidCore.isRelationQuery(value) && // `subQuery = 1` case is when callback returns the same query as it gets,
+      // for example `q => q.get('name')`.
+      value.q.subQuery !== 1) {
         query.q.selectRelation = joinQuery = true;
         value = value.joinQuery(value, q);
         let subQuery;
@@ -6082,7 +6090,7 @@ const getShapeFromSelect = (q, isSubQuery) => {
               key
             );
           } else if (orchidCore.isExpression(it)) {
-            result[key] = it.result.value;
+            result[key] = it.result.value || UnknownColumn.instance;
           } else if (it) {
             const { returnType } = it.q;
             if (returnType === "value" || returnType === "valueOrThrow") {
@@ -7725,149 +7733,6 @@ function pushLimitSQL(sql, values, q) {
   }
 }
 
-const { types } = pg;
-const defaultTypeParsers = {};
-for (const key in types.builtins) {
-  const id = types.builtins[key];
-  defaultTypeParsers[id] = types.getTypeParser(id);
-}
-[
-  types.builtins.DATE,
-  types.builtins.TIMESTAMP,
-  types.builtins.TIMESTAMPTZ,
-  types.builtins.TIME,
-  types.builtins.CIRCLE
-].forEach((id) => {
-  delete defaultTypeParsers[id];
-});
-const returnArg = (arg) => arg;
-const rollbackSql = { text: "ROLLBACK" };
-const commitSql = { text: "COMMIT" };
-class Adapter {
-  constructor({ types: types2 = defaultTypeParsers, ...config }) {
-    this.types = types2;
-    let schema = config.schema;
-    if (config.databaseURL) {
-      const url = new URL(config.databaseURL);
-      const ssl = url.searchParams.get("ssl");
-      if (ssl === "false") {
-        url.searchParams.delete("ssl");
-      } else if (!config.ssl && ssl === "true") {
-        config.ssl = true;
-      }
-      if (!schema) {
-        schema = url.searchParams.get("schema") || void 0;
-      }
-      config.databaseURL = url.toString();
-      config.connectionString = config.databaseURL;
-    }
-    if (schema) this.schema = schema === "public" ? void 0 : schema;
-    this.config = config;
-    this.pool = new pg.Pool(config);
-    if (config.connectRetry) {
-      orchidCore.setAdapterConnectRetry(
-        this,
-        () => this.pool.connect(),
-        config.connectRetry === true ? orchidCore.emptyObject : config.connectRetry
-      );
-    }
-  }
-  connect() {
-    return this.pool.connect();
-  }
-  query(query, types2) {
-    return performQuery$1(this, query, types2);
-  }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  arrays(query, types2) {
-    return performQuery$1(this, query, types2, "array");
-  }
-  async transaction(begin, cb, end = commitSql) {
-    const client = await this.connect();
-    try {
-      await setSearchPath(client, this.schema);
-      await performQueryOnClient(client, begin, this.types);
-      let result;
-      try {
-        result = await cb(new TransactionAdapter(this, client, this.types));
-      } catch (err) {
-        await performQueryOnClient(client, rollbackSql, this.types);
-        throw err;
-      }
-      await performQueryOnClient(client, end, this.types);
-      return result;
-    } finally {
-      client.release();
-    }
-  }
-  close() {
-    const { pool } = this;
-    this.pool = new pg.Pool(this.config);
-    return pool.end();
-  }
-}
-const defaultTypesConfig = {
-  getTypeParser(id) {
-    return defaultTypeParsers[id] || returnArg;
-  }
-};
-const setSearchPath = (client, schema) => {
-  if (client.connection.schema !== schema) {
-    client.connection.schema = schema;
-    return client.query(`SET search_path = ${schema || "public"}`);
-  }
-  return;
-};
-const performQuery$1 = async (adapter, query, types2, rowMode) => {
-  const client = await adapter.connect();
-  try {
-    await setSearchPath(client, adapter.schema);
-    return await performQueryOnClient(client, query, types2, rowMode);
-  } finally {
-    client.release();
-  }
-};
-const performQueryOnClient = (client, query, types2, rowMode) => {
-  const params = {
-    text: typeof query === "string" ? query : query.text,
-    values: typeof query === "string" ? void 0 : query.values,
-    rowMode,
-    types: types2 ? {
-      getTypeParser(id) {
-        return types2[id] || returnArg;
-      }
-    } : defaultTypesConfig
-  };
-  return client.query(params);
-};
-class TransactionAdapter {
-  constructor(adapter, client, types2) {
-    this.adapter = adapter;
-    this.client = client;
-    this.types = types2;
-    this.pool = adapter.pool;
-    this.config = adapter.config;
-    this.schema = adapter.schema;
-  }
-  connect() {
-    return Promise.resolve(this.client);
-  }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async query(query, types2) {
-    return await performQueryOnClient(this.client, query, types2);
-  }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async arrays(query, types2) {
-    return await performQueryOnClient(this.client, query, types2, "array");
-  }
-  async transaction(_, cb) {
-    return await cb(this);
-  }
-  close() {
-    return this.adapter.close();
-  }
-}
-
 class FnExpression extends orchidCore.Expression {
   /**
    * @param query - query object.
@@ -12266,7 +12131,7 @@ class QueryMethods {
    * @param uniqueColumnValues - is derived from primary keys and unique indexes in the table
    */
   findBy(uniqueColumnValues) {
-    return _queryFindBy(_clone(this), [uniqueColumnValues]);
+    return _queryFindBy(_clone(this), uniqueColumnValues);
   }
   /**
    * Finds a single unique record, returns `undefined` if not found.
@@ -12282,9 +12147,10 @@ class QueryMethods {
    * @param uniqueColumnValues - is derived from primary keys and unique indexes in the table
    */
   findByOptional(uniqueColumnValues) {
-    return _queryFindByOptional(_clone(this), [
+    return _queryFindByOptional(
+      _clone(this),
       uniqueColumnValues
-    ]);
+    );
   }
   /**
    * Specifies the schema to be used as a prefix of a table name.
@@ -12879,7 +12745,8 @@ const performQuery = async (q, args, method) => {
   if (log) logData = log.beforeQuery(sql);
   try {
     const result = await (trx?.adapter || q.adapter)[method](
-      sql
+      sql.text,
+      sql.values
     );
     if (log) log.afterQuery(sql, logData);
     return result;
@@ -13165,7 +13032,7 @@ class Db extends QueryMethods {
 }
 orchidCore.applyMixins(Db, [QueryMethods]);
 Db.prototype.constructor = Db;
-const createDb = ({
+const createDbWithAdapter = ({
   log,
   logger,
   snakeCase,
@@ -13173,7 +13040,7 @@ const createDb = ({
   columnTypes: ctOrFn = makeColumnTypes(schemaConfig),
   ...options
 }) => {
-  const adapter = "adapter" in options ? options.adapter : new Adapter(options);
+  const { adapter } = options;
   const commonOptions = {
     log,
     logger,
@@ -13370,7 +13237,6 @@ function copyTableData(query, arg) {
   return q;
 }
 
-exports.Adapter = Adapter;
 exports.AfterCommitError = AfterCommitError;
 exports.AggregateMethods = AggregateMethods;
 exports.ArrayColumn = ArrayColumn;
@@ -13454,7 +13320,6 @@ exports.TimeColumn = TimeColumn;
 exports.TimestampColumn = TimestampColumn;
 exports.TimestampTZColumn = TimestampTZColumn;
 exports.Transaction = Transaction;
-exports.TransactionAdapter = TransactionAdapter;
 exports.TransformMethods = TransformMethods;
 exports.TsQueryColumn = TsQueryColumn;
 exports.TsVectorColumn = TsVectorColumn;
@@ -13537,12 +13402,12 @@ exports.columnExcludesToCode = columnExcludesToCode;
 exports.columnForeignKeysToCode = columnForeignKeysToCode;
 exports.columnIndexesToCode = columnIndexesToCode;
 exports.columnsShapeToCode = columnsShapeToCode;
-exports.commitSql = commitSql$1;
+exports.commitSql = commitSql;
 exports.constraintInnerToCode = constraintInnerToCode;
 exports.constraintToCode = constraintToCode;
 exports.copyTableData = copyTableData;
 exports.countSelect = countSelect;
-exports.createDb = createDb;
+exports.createDbWithAdapter = createDbWithAdapter;
 exports.defaultSchemaConfig = defaultSchemaConfig;
 exports.escapeForLog = escapeForLog;
 exports.escapeForMigration = escapeForMigration;
@@ -13597,7 +13462,7 @@ exports.queryWrap = queryWrap;
 exports.raw = raw;
 exports.referencesArgsToCode = referencesArgsToCode;
 exports.resolveSubQueryCallbackV2 = resolveSubQueryCallbackV2;
-exports.rollbackSql = rollbackSql$1;
+exports.rollbackSql = rollbackSql;
 exports.saveAliasedShape = saveAliasedShape;
 exports.setColumnDefaultParse = setColumnDefaultParse;
 exports.setColumnEncode = setColumnEncode;