pqb 0.10.19 → 0.10.22

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import * as orchid_core from 'orchid-core';
 import { EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsShapeBase, StringKey, ColumnOutput, NullableColumn, QueryInternal, QueryMetaBase, EmptyTuple, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryBaseCommon, QueryCommon, ColumnDataBase, BaseOperators, PrimaryKeyColumn, HiddenColumn, ValidationContext, MessageParam, BaseNumberData, Code, numberTypeMethods, BaseStringData, DateColumnData, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
+import { inspect } from 'util';
 
 declare type BaseRelation = {
     type: string;
@@ -261,14 +262,18 @@ declare type QueryArraysResult<R extends any[] = any[]> = {
         name: string;
     }[];
 };
-declare type AdapterOptions = Omit<PoolConfig, 'types' | 'connectionString'> & {
-    types?: TypeParsers;
+declare type AdapterConfig = Omit<PoolConfig, 'types' | 'connectionString'> & {
+    schema?: string;
     databaseURL?: string;
 };
+declare type AdapterOptions = AdapterConfig & {
+    types?: TypeParsers;
+};
 declare class Adapter implements AdapterBase {
     types: TypeParsers;
     pool: Pool;
     config: PoolConfig;
+    schema?: string;
     constructor({ types, ...config }: AdapterOptions);
     query<T extends QueryResultRow = any>(query: QueryInput, types?: TypeParsers): Promise<QueryResult<T>>;
     arrays<R extends any[] = any[]>(query: QueryInput, types?: TypeParsers): Promise<QueryArraysResult<R>>;
@@ -729,14 +734,23 @@ declare class OnQueryBuilder<S extends QueryBase = QueryBase, J extends QueryBas
     _onJsonPathEquals<T extends this>(this: T, ...args: OnJsonPathEqualsArgs<T>): T;
 }
 
-declare class PormError extends Error {
+declare abstract class OrchidOrmError extends Error {
+    abstract query: Query;
+}
+declare class NotFoundError extends OrchidOrmError {
+    query: Query;
+    constructor(query: Query, message?: string);
+}
+declare class OrchidOrmInternalError extends Error {
+    query: Query;
+    constructor(query: Query, message?: string);
 }
 declare type QueryErrorName = 'parseComplete' | 'bindComplete' | 'closeComplete' | 'noData' | 'portalSuspended' | 'replicationStart' | 'emptyQuery' | 'copyDone' | 'copyData' | 'rowDescription' | 'parameterDescription' | 'parameterStatus' | 'backendKeyData' | 'notification' | 'readyForQuery' | 'commandComplete' | 'dataRow' | 'copyInResponse' | 'copyOutResponse' | 'authenticationOk' | 'authenticationMD5Password' | 'authenticationCleartextPassword' | 'authenticationSASL' | 'authenticationSASLContinue' | 'authenticationSASLFinal' | 'error' | 'notice';
-declare class QueryError<T extends {
+declare abstract class QueryError<T extends {
     shape: ColumnsShape;
 } = {
     shape: ColumnsShape;
-}> extends Error {
+}> extends OrchidOrmInternalError {
     message: string;
     name: QueryErrorName;
     stack: string | undefined;
@@ -762,15 +776,12 @@ declare class QueryError<T extends {
     };
     get columns(): T["shape"] extends infer T_1 ? { [K in keyof T_1]?: true | undefined; } : never;
 }
-declare class NotFoundError extends PormError {
-    constructor(message?: string);
-}
-declare class MoreThanOneRowError extends PormError {
-}
-declare class OrchidInternalError extends Error {
+declare class MoreThanOneRowError extends OrchidOrmInternalError {
+    constructor(query: Query, message?: string);
 }
-declare class UnhandledTypeError extends OrchidInternalError {
-    constructor(value: never);
+declare class UnhandledTypeError extends OrchidOrmInternalError {
+    query: Query;
+    constructor(query: Query, value: never);
 }
 
 declare type NoPrimaryKeyOption = 'error' | 'warning' | 'ignore';
@@ -819,6 +830,7 @@ declare class Db<Table extends string | undefined = undefined, Shape extends Col
     whereQueryBuilder: typeof WhereQueryBuilder;
     onQueryBuilder: typeof OnQueryBuilder;
     constructor(adapter: Adapter, queryBuilder: Db, table: Table, shape: Shape, columnTypes: CT, options: DbTableOptions);
+    [inspect.custom](): string;
 }
 declare type DbResult<CT extends ColumnTypesBase> = Db<string, Record<string, never>, Query['relations'], ColumnTypesBase extends CT ? DefaultColumnTypes : CT> & {
     <Table extends string, Shape extends ColumnsShape = ColumnsShape>(table: Table, shape?: ((t: ColumnTypesBase extends CT ? DefaultColumnTypes : CT) => Shape) | Shape, options?: DbTableOptions): Db<Table, Shape>;
@@ -3596,4 +3608,4 @@ declare const setQueryObjectValue: <T extends {
     query: QueryData;
 }>(q: T, object: string, key: string, value: unknown) => T;
 
-export { Adapter, AdapterOptions, AddQueryJoinedTable, AddQuerySelect, AddQueryWith, AfterCallback, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeCallback, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnNameOfTable, ColumnOperators, ColumnParser, ColumnType, ColumnTypes, ColumnsObject, ColumnsParsers, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeWithTimeZoneBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DomainColumn, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, ForeignKeyTable, ForeignKeyTableWithColumns, From, FromArgs, FromResult, GetArg, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingItem, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinResult, JoinedTablesBase, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidInternalError, OrderArg, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, PormError, Query, QueryArraysResult, QueryBase, QueryCallbacks, QueryData, QueryError, QueryErrorName, QueryGet, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryThen, QueryUpsertOrCreate, QueryWithTable, RawMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryJoinedTables, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWindows, SetQueryWith, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, Sql, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimeWithTimeZoneColumn, TimestampColumn, TimestampWithTimeZoneColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, createDb, defaultsKey, foreignKeyArgsToCode, foreignKeyArgumentToCode, foreignKeyToCode, getClonedQueryData, getColumnTypes, getQueryAs, getRaw, getShapeFromSelect, getTableData, getValueKey, handleResult, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, relationQueryKey, resetTableData, setQueryObjectValue, toSql, toSqlCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQueryJoinedTable, AddQuerySelect, AddQueryWith, AfterCallback, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeCallback, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnNameOfTable, ColumnOperators, ColumnParser, ColumnType, ColumnTypes, ColumnsObject, ColumnsParsers, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeWithTimeZoneBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DomainColumn, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, ForeignKeyTable, ForeignKeyTableWithColumns, From, FromArgs, FromResult, GetArg, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingItem, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinResult, JoinedTablesBase, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, Query, QueryArraysResult, QueryBase, QueryCallbacks, QueryData, QueryError, QueryErrorName, QueryGet, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryThen, QueryUpsertOrCreate, QueryWithTable, RawMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryJoinedTables, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWindows, SetQueryWith, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, Sql, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimeWithTimeZoneColumn, TimestampColumn, TimestampWithTimeZoneColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, createDb, defaultsKey, foreignKeyArgsToCode, foreignKeyArgumentToCode, foreignKeyToCode, getClonedQueryData, getColumnTypes, getQueryAs, getRaw, getShapeFromSelect, getTableData, getValueKey, handleResult, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, relationQueryKey, resetTableData, setQueryObjectValue, toSql, toSqlCacheKey };

package/dist/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var orchidCore = require('orchid-core');
 var pg = require('pg');
+var util = require('util');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -2066,9 +2067,21 @@ const aggregateToSql = (ctx, table, item, quotedAs) => {
   return sql.join("");
 };
 
-class PormError extends Error {
+class OrchidOrmError extends Error {
 }
-class QueryError extends Error {
+class NotFoundError extends OrchidOrmError {
+  constructor(query, message = "Record is not found") {
+    super(message);
+    this.query = query;
+  }
+}
+class OrchidOrmInternalError extends Error {
+  constructor(query, message) {
+    super(message);
+    this.query = query;
+  }
+}
+class QueryError extends OrchidOrmInternalError {
   get isUnique() {
     return this.code === "23505";
   }
@@ -2089,18 +2102,15 @@ class QueryError extends Error {
     return this.columnsCache = columns;
   }
 }
-class NotFoundError extends PormError {
-  constructor(message = "Record is not found") {
-    super(message);
+class MoreThanOneRowError extends OrchidOrmInternalError {
+  constructor(query, message) {
+    super(query, message);
   }
 }
-class MoreThanOneRowError extends PormError {
-}
-class OrchidInternalError extends Error {
-}
-class UnhandledTypeError extends OrchidInternalError {
-  constructor(value) {
-    super(`Unhandled type: ${JSON.stringify(value)} received`);
+class UnhandledTypeError extends OrchidOrmInternalError {
+  constructor(query, value) {
+    super(query, `Unhandled type: ${JSON.stringify(value)} received`);
+    this.query = query;
   }
 }
 
@@ -2226,7 +2236,10 @@ const pushSubQuerySql = (query, as, values, list) => {
       const { select } = query.query;
       const first = select == null ? void 0 : select[0];
       if (!select || !first) {
-        throw new OrchidInternalError(`Nothing was selected for pluck`);
+        throw new OrchidOrmInternalError(
+          query,
+          `Nothing was selected for pluck`
+        );
       }
       const cloned = query.clone();
       cloned.query.select = [{ selectAs: { c: first } }];
@@ -2241,7 +2254,7 @@ const pushSubQuerySql = (query, as, values, list) => {
     case "void":
       break;
     default:
-      throw new UnhandledTypeError(returnType);
+      throw new UnhandledTypeError(query, returnType);
   }
   let subQuerySql = `(${makeSql(query, { values }).text})`;
   const { coalesceValue } = query.query;
@@ -3370,36 +3383,45 @@ class Adapter {
   constructor(_a) {
     var _b = _a, { types: types2 = defaultTypeParsers } = _b, config = __objRest$1(_b, ["types"]);
     this.types = types2;
+    let schema = config.schema;
     if (config.databaseURL) {
-      config.connectionString = config.databaseURL;
       const url = new URL(config.databaseURL);
-      if (url.searchParams.get("ssl") === "true") {
+      const ssl = url.searchParams.get("ssl");
+      if (ssl === "false") {
+        url.searchParams.delete("ssl");
+      } else if (!config.ssl && ssl === "true") {
         config.ssl = true;
       }
-      url.searchParams.delete("ssl");
+      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__default["default"].Pool(config);
   }
-  async query(query, types2) {
-    return performQuery(this.pool, query, types2);
+  query(query, types2) {
+    return performQuery(this.pool, query, types2, this.schema);
   }
-  async arrays(query, types2) {
-    return performQueryArrays(this.pool, query, types2);
+  arrays(query, types2) {
+    return performQuery(this.pool, query, types2, this.schema, "array");
   }
   async transaction(cb) {
     const client = await this.pool.connect();
     try {
-      await performQuery(client, { text: "BEGIN" }, this.types);
+      await setSearchPath(client, this.schema);
+      await performQueryOnClient(client, { text: "BEGIN" }, this.types);
       let result;
       try {
         result = await cb(new TransactionAdapter(this, client, this.types));
       } catch (err) {
-        await performQuery(client, { text: "ROLLBACK" }, this.types);
+        await performQueryOnClient(client, { text: "ROLLBACK" }, this.types);
         throw err;
       }
-      await performQuery(client, { text: "COMMIT" }, this.types);
+      await performQueryOnClient(client, { text: "COMMIT" }, this.types);
       return result;
     } finally {
       client.release();
@@ -3416,28 +3438,34 @@ const defaultTypesConfig = {
     return defaultTypeParsers[id] || returnArg;
   }
 };
-const performQuery = (pool, query, types2) => {
-  return pool.query({
-    text: typeof query === "string" ? query : query.text,
-    values: typeof query === "string" ? void 0 : query.values,
-    types: types2 ? {
-      getTypeParser(id) {
-        return types2[id] || returnArg;
-      }
-    } : defaultTypesConfig
-  });
+const setSearchPath = (client, schema) => {
+  if (client.connection.schema !== schema) {
+    client.connection.schema = schema;
+    return client.query(`SET search_path = ${schema || "public"}`);
+  }
+  return;
+};
+const performQuery = async (pool, query, types2, schema, rowMode) => {
+  const client = await pool.connect();
+  try {
+    await setSearchPath(client, schema);
+    return await performQueryOnClient(client, query, types2, rowMode);
+  } finally {
+    client.release();
+  }
 };
-const performQueryArrays = (pool, query, types2) => {
-  return pool.query({
+const performQueryOnClient = (client, query, types2, rowMode) => {
+  const params = {
     text: typeof query === "string" ? query : query.text,
     values: typeof query === "string" ? void 0 : query.values,
-    rowMode: "array",
+    rowMode,
     types: types2 ? {
       getTypeParser(id) {
         return types2[id] || returnArg;
       }
     } : defaultTypesConfig
-  });
+  };
+  return client.query(params);
 };
 class TransactionAdapter {
   constructor(adapter, client, types2) {
@@ -3448,10 +3476,10 @@ class TransactionAdapter {
     this.config = adapter.config;
   }
   async query(query, types2) {
-    return await performQuery(this.client, query, types2);
+    return await performQueryOnClient(this.client, query, types2);
   }
   async arrays(query, types2) {
-    return await performQueryArrays(this.client, query, types2);
+    return await performQueryOnClient(this.client, query, types2, "array");
   }
   async transaction(cb) {
     return await cb(this);
@@ -3633,7 +3661,7 @@ const parseResult = (q, returnType = "all", result, isSubQuery) => {
   switch (returnType) {
     case "all": {
       if (q.query.throwOnNotFound && result.rows.length === 0)
-        throw new NotFoundError();
+        throw new NotFoundError(q);
       const { parsers } = q.query;
       return parsers ? result.rows.map((row) => parseRecord(parsers, row)) : result.rows;
     }
@@ -3647,7 +3675,7 @@ const parseResult = (q, returnType = "all", result, isSubQuery) => {
     case "oneOrThrow": {
       const row = result.rows[0];
       if (!row)
-        throw new NotFoundError();
+        throw new NotFoundError(q);
       const { parsers } = q.query;
       return parsers ? parseRecord(parsers, row) : row;
     }
@@ -3678,12 +3706,12 @@ const parseResult = (q, returnType = "all", result, isSubQuery) => {
     case "valueOrThrow": {
       const value = (_b = result.rows[0]) == null ? void 0 : _b[0];
       if (value === void 0)
-        throw new NotFoundError();
+        throw new NotFoundError(q);
       return parseValue(value, q);
     }
     case "rowCount": {
       if (q.query.throwOnNotFound && result.rowCount === 0) {
-        throw new NotFoundError();
+        throw new NotFoundError(q);
       }
       return result.rowCount;
     }
@@ -3767,7 +3795,7 @@ const addParserForSelectItem = (q, as, key, arg) => {
       if (parsers) {
         addParserToQuery(q.query, key, (item) => {
           const t = rel.query.returnType || "all";
-          subQueryResult.rows = t === "all" || t === "rows" || t === "pluck" ? item : [item];
+          subQueryResult.rows = t === "value" || t === "valueOrThrow" ? [[item]] : t === "one" || t === "oneOrThrow" ? [item] : item;
           return parseResult(rel, t, subQueryResult, true);
         });
       }
@@ -4665,7 +4693,7 @@ const insert = (self, {
     const { handleResult } = q.query;
     q.query.handleResult = async (q2, r, i) => {
       if (r.rowCount === 0) {
-        throw new NotFoundError();
+        throw new NotFoundError(q2);
       }
       return await handleResult(q2, r, i);
     };
@@ -5731,6 +5759,7 @@ class QueryUpsertOrCreate {
         return q.create(data);
       } else if (queryResult.rowCount > 1) {
         throw new MoreThanOneRowError(
+          q,
           `Only one row was expected to find, found ${queryResult.rowCount} rows.`
         );
       }
@@ -6094,9 +6123,16 @@ class Db {
     } : toSql;
     this.relations = {};
     modifyQuery == null ? void 0 : modifyQuery.forEach((cb) => cb(this));
+    const self = this;
     this.error = class extends QueryError {
+      constructor(message) {
+        super(self, message);
+      }
     };
   }
+  [util.inspect.custom]() {
+    return `QueryObject<${this.table}>`;
+  }
 }
 orchidCore.applyMixins(Db, [QueryMethods]);
 Db.prototype.constructor = Db;
@@ -6211,12 +6247,12 @@ exports.NumberBaseColumn = NumberBaseColumn;
 exports.OnConflictQueryBuilder = OnConflictQueryBuilder;
 exports.OnQueryBuilder = OnQueryBuilder;
 exports.Operators = Operators;
-exports.OrchidInternalError = OrchidInternalError;
+exports.OrchidOrmError = OrchidOrmError;
+exports.OrchidOrmInternalError = OrchidOrmInternalError;
 exports.PathColumn = PathColumn;
 exports.PluckResultColumnType = PluckResultColumnType;
 exports.PointColumn = PointColumn;
 exports.PolygonColumn = PolygonColumn;
-exports.PormError = PormError;
 exports.QueryCallbacks = QueryCallbacks;
 exports.QueryError = QueryError;
 exports.QueryGet = QueryGet;