pqb 0.55.1 → 0.56.3

package/dist/index.mjs

@@ -1,5 +1,4 @@
-import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, templateLiteralSQLToCode, quoteObjectKey, toArray, emptyArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, setObjectValueImmutable, getValueKey, addValue, isExpression, dateDataToCode, joinTruthy, arrayDataToCode, numberDataToCode, noop, stringDataToCode, getDefaultLanguage, setDefaultNowFn, setDefaultLanguage, setCurrentColumnName, timestampHelpers, _getQueryAliasOrName, _getQueryOuterAliases, returnArg as returnArg$1, pushQueryValueImmutable, NotFoundError, _setSubQueryAliases, _applyRelationAliases, isRelationQuery, OrchidOrmInternalError, _checkIfAliased, logColors, OrchidOrmError, applyTransforms, callWithThis, requirePrimaryKeys, pick, getFreeAlias, _setQueryAs, _copyQueryAliasToQuery, setParserToQuery, newDelayedRelationSelect, pushOrNewArray, getPrimaryKeys, setDelayedRelation, UnhandledTypeError, isRawSQL, setAdapterConnectRetry, pushOrNewArrayToObjectImmutable, QueryHookUtils, MoreThanOneRowError, isObjectEmpty, ValExpression, applyMixins, _getQueryAs, _setQueryAlias, QueryError, snakeCaseKey } from 'orchid-core';
-import pg from 'pg';
+import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, templateLiteralSQLToCode, quoteObjectKey, toArray, emptyArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, setObjectValueImmutable, getValueKey, addValue, isExpression, dateDataToCode, joinTruthy, arrayDataToCode, numberDataToCode, noop, stringDataToCode, getDefaultLanguage, setDefaultNowFn, setDefaultLanguage, setCurrentColumnName, timestampHelpers, _getQueryAliasOrName, _getQueryOuterAliases, returnArg, pushQueryValueImmutable, NotFoundError, OrchidOrmInternalError, _setSubQueryAliases, _applyRelationAliases, isRelationQuery, _checkIfAliased, logColors, OrchidOrmError, applyTransforms, callWithThis, requirePrimaryKeys, pick, getFreeAlias, _setQueryAs, _copyQueryAliasToQuery, setParserToQuery, newDelayedRelationSelect, pushOrNewArray, getPrimaryKeys, setDelayedRelation, UnhandledTypeError, isRawSQL, pushOrNewArrayToObjectImmutable, QueryHookUtils, MoreThanOneRowError, isObjectEmpty, ValExpression, applyMixins, _getQueryAs, _setQueryAlias, QueryError, snakeCaseKey } from 'orchid-core';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { templateLiteralToSQL as templateLiteralToSQL$1 } from 'pqb';
@@ -2747,6 +2746,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;
 };
@@ -2782,12 +2782,16 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     if (value === void 0) continue;
     if (key === "AND") {
       const arr = 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(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 = toArray(value);
       ands.push(`NOT ${processAnds(arr, ctx, table, query, quotedAs, true)}`);
@@ -3224,7 +3228,7 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
       };
     }
   }
-  const args0 = args.length ? args[0] : returnArg$1;
+  const args0 = args.length ? args[0] : returnArg;
   if (typeof args0 === "function") {
     const q = first;
     if (q.joinQueryAfterCallback) {
@@ -3341,11 +3345,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 OrchidOrmInternalError(
+        q,
+        `${method} was called with undefined value`
+      );
+    }
+  }
+  if (!nonEmpty) {
+    throw new OrchidOrmInternalError(
+      q,
+      `${method} was called with empty object`
+    );
+  }
 };
 const _queryWhereSql = (q, args) => {
   return pushQueryValueImmutable(
@@ -4537,10 +4561,10 @@ class QueryLog {
   }
 }
 
-const commitSql$1 = {
+const commitSql = {
   text: "COMMIT"
 };
-const rollbackSql$1 = {
+const rollbackSql = {
   text: "ROLLBACK"
 };
 class AfterCommitError extends OrchidOrmError {
@@ -4589,7 +4613,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();
@@ -4604,13 +4628,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 {
@@ -4618,20 +4658,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;
@@ -4976,25 +5016,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,
@@ -5104,32 +5129,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);
@@ -5282,9 +5312,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;
@@ -5310,37 +5340,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;
@@ -5706,7 +5712,7 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
         }))
       );
     }
-    if (query.hookSelect || query.parsers || query.transform) {
+    if (query.hookSelect || query.parsers || query.transform || query.returnType === "oneOrThrow" || query.returnType === "valueOrThrow" || query.returnType === "one" || query.returnType === "value") {
       pushQueryValueImmutable(q, "batchParsers", {
         path: [key],
         fn: (path, queryResult) => {
@@ -5747,7 +5753,7 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
                 if (returnType === "one") {
                   for (const batch of batches) {
                     if (batch.data) parseRecord(parsers, batch.data);
-                    else batch.data = void 0;
+                    else batch.parent[batch.key] = batch.data = void 0;
                   }
                 } else {
                   for (const { data } of batches) {
@@ -5757,7 +5763,8 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
                 }
               } else if (returnType === "one") {
                 for (const batch of batches) {
-                  if (!batch.data) batch.data = void 0;
+                  if (!batch.data)
+                    batch.parent[batch.key] = batch.data = void 0;
                 }
               } else {
                 for (const { data } of batches) {
@@ -5784,22 +5791,30 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
             }
             case "value":
             case "valueOrThrow": {
+              const notNullable = !query.getColumn?.data.isNullable;
               const parse = query.parsers?.[getValueKey];
               if (parse) {
                 if (returnType === "value") {
                   for (const item of batches) {
-                    item.parent[item.key] = item.data = item.data === void 0 ? query.notFoundDefault : parse(item.data);
+                    item.parent[item.key] = item.data = item.data === null ? query.notFoundDefault : parse(item.data);
                   }
                 } else {
                   for (const item of batches) {
-                    if (item.data === void 0)
+                    if (notNullable && item.data === null) {
                       throw new NotFoundError(arg);
+                    }
                     item.parent[item.key] = item.data = parse(item.data);
                   }
                 }
-              } else if (returnType !== "value") {
+              } else if (returnType === "value") {
+                for (const item of batches) {
+                  if (item.data === null) {
+                    item.parent[item.key] = item.data = query.notFoundDefault;
+                  }
+                }
+              } else if (notNullable) {
                 for (const { data } of batches) {
-                  if (data === void 0) throw new NotFoundError(arg);
+                  if (data === null) throw new NotFoundError(arg);
                 }
               }
               if (hookSelect) {
@@ -5917,7 +5932,9 @@ const processSelectArg = (q, as, arg, columnAs) => {
           return false;
         }
       }
-      if (!isExpression(value) && isRelationQuery(value)) {
+      if (!isExpression(value) && 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;
@@ -6080,7 +6097,7 @@ const getShapeFromSelect = (q, isSubQuery) => {
               key
             );
           } else if (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") {
@@ -7723,149 +7740,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) {
-      setAdapterConnectRetry(
-        this,
-        () => this.pool.connect(),
-        config.connectRetry === true ? 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 Expression {
   /**
    * @param query - query object.
@@ -7974,14 +7848,18 @@ const isSelectingCount = (q) => {
   const { expr } = q.q;
   return expr instanceof FnExpression && expr.fn === "count" && expr.args[0] === "*";
 };
-const int = new IntegerColumn(defaultSchemaConfig).parse(parseInt);
-const float = new RealColumn(defaultSchemaConfig).parse(parseFloat);
-const stringAsNumber = new NumberAsStringBaseColumn(
+const intNullable = new IntegerColumn(defaultSchemaConfig).nullable().parse(parseInt);
+const floatNullable = new RealColumn(defaultSchemaConfig).nullable().parse(parseFloat);
+const booleanNullable = BooleanColumn.instance.nullable();
+const textNullable = TextColumn.instance.nullable();
+const jsonTextNullable = JSONTextColumn.instance.nullable();
+const xmlNullable = XMLColumn.instance.nullable();
+const stringAsNumberNullable = new NumberAsStringBaseColumn(
   defaultSchemaConfig
-);
+).nullable();
 const numericResultColumn = (q, arg) => {
   const type = typeof arg === "string" ? _getSelectableColumn(q, arg) : arg.result.value;
-  return type instanceof NumberBaseColumn ? float : stringAsNumber;
+  return type instanceof NumberBaseColumn ? floatNullable : stringAsNumberNullable;
 };
 class AggregateMethods {
   /**
@@ -8024,7 +7902,13 @@ class AggregateMethods {
    * @param options - aggregation options
    */
   count(arg = "*", options) {
-    return makeFnExpression(this, int, "count", [arg], options);
+    return makeFnExpression(
+      this,
+      intNullable,
+      "count",
+      [arg],
+      options
+    );
   }
   /**
    * Get the minimum value for the specified numeric column, returns number or `null` if there are no records.
@@ -8219,7 +8103,7 @@ class AggregateMethods {
   boolAnd(arg, options) {
     return makeFnExpression(
       this,
-      BooleanColumn.instance,
+      booleanNullable,
       "bool_and",
       [arg],
       options
@@ -8248,7 +8132,7 @@ class AggregateMethods {
   boolOr(arg, options) {
     return makeFnExpression(
       this,
-      BooleanColumn.instance,
+      booleanNullable,
       "bool_or",
       [arg],
       options
@@ -8260,7 +8144,7 @@ class AggregateMethods {
   every(arg, options) {
     return makeFnExpression(
       this,
-      BooleanColumn.instance,
+      booleanNullable,
       "every",
       [arg],
       options
@@ -8293,7 +8177,7 @@ class AggregateMethods {
   jsonAgg(arg, options) {
     return makeFnExpression(
       this,
-      JSONTextColumn.instance,
+      jsonTextNullable,
       "json_agg",
       [arg],
       options
@@ -8305,7 +8189,7 @@ class AggregateMethods {
   jsonbAgg(arg, options) {
     return makeFnExpression(
       this,
-      JSONTextColumn.instance,
+      jsonTextNullable,
       "jsonb_agg",
       [arg],
       options
@@ -8346,7 +8230,7 @@ class AggregateMethods {
   jsonObjectAgg(arg, options) {
     return makeFnExpression(
       this,
-      JSONTextColumn.instance,
+      jsonTextNullable,
       "json_object_agg",
       [{ pairs: arg }],
       options
@@ -8358,7 +8242,7 @@ class AggregateMethods {
   jsonbObjectAgg(arg, options) {
     return makeFnExpression(
       this,
-      JSONTextColumn.instance,
+      jsonTextNullable,
       "jsonb_object_agg",
       [{ pairs: arg }],
       options
@@ -8389,7 +8273,7 @@ class AggregateMethods {
   stringAgg(arg, delimiter, options) {
     return makeFnExpression(
       this,
-      TextColumn.instance,
+      textNullable,
       "string_agg",
       [arg, { value: delimiter }],
       options
@@ -8415,7 +8299,7 @@ class AggregateMethods {
   xmlAgg(arg, options) {
     return makeFnExpression(
       this,
-      XMLColumn.instance,
+      xmlNullable,
       "xmlagg",
       [arg],
       options
@@ -8440,7 +8324,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   rowNumber(over) {
-    return makeFnExpression(this, int, "row_number", emptyArray, {
+    return makeFnExpression(this, intNullable, "row_number", emptyArray, {
       over
     });
   }
@@ -8463,7 +8347,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   rank(over) {
-    return makeFnExpression(this, int, "rank", emptyArray, {
+    return makeFnExpression(this, intNullable, "rank", emptyArray, {
       over
     });
   }
@@ -8486,7 +8370,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   denseRank(over) {
-    return makeFnExpression(this, int, "dense_rank", emptyArray, {
+    return makeFnExpression(this, intNullable, "dense_rank", emptyArray, {
       over
     });
   }
@@ -8509,7 +8393,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   percentRank(over) {
-    return makeFnExpression(this, int, "percent_rank", emptyArray, {
+    return makeFnExpression(this, intNullable, "percent_rank", emptyArray, {
       over
     });
   }
@@ -8532,7 +8416,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   cumeDist(over) {
-    return makeFnExpression(this, float, "cume_dist", emptyArray, {
+    return makeFnExpression(this, floatNullable, "cume_dist", emptyArray, {
       over
     });
   }
@@ -12264,7 +12148,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.
@@ -12280,9 +12164,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.
@@ -12877,7 +12762,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;
@@ -13163,7 +13049,7 @@ class Db extends QueryMethods {
 }
 applyMixins(Db, [QueryMethods]);
 Db.prototype.constructor = Db;
-const createDb = ({
+const createDbWithAdapter = ({
   log,
   logger,
   snakeCase,
@@ -13171,7 +13057,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,
@@ -13368,5 +13254,5 @@ function copyTableData(query, arg) {
   return q;
 }
 
-export { Adapter, AfterCommitError, AggregateMethods, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryAsMethods, QueryCreate, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsert, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _clone, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, _runAfterCommitHooks, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, assignDbDataToColumn, checkIfASimpleQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getFullColumnTable, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, isDefaultTimeStamp, isInUserTransaction, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, moveQueryValueToWith, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql$1 as rollbackSql, saveAliasedShape, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
+export { AfterCommitError, AggregateMethods, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryAsMethods, QueryCreate, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsert, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _clone, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, _runAfterCommitHooks, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, assignDbDataToColumn, checkIfASimpleQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDbWithAdapter, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getFullColumnTable, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, isDefaultTimeStamp, isInUserTransaction, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, moveQueryValueToWith, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql, saveAliasedShape, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
 //# sourceMappingURL=index.mjs.map