pqb 0.40.1 → 0.40.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts CHANGED
@@ -4990,7 +4990,7 @@ type AfterCommitErrorResult = AfterCommitErrorFulfilledResult | AfterCommitError
4990
4990
  * }
4991
4991
  * ```
4992
4992
  *
4993
- * Use `functoin name() {}` function syntax for hooks to give them names,
4993
+ * Use `function name() {}` function syntax for hooks to give them names,
4994
4994
  * so later they can be identified when handling after commit errors.
4995
4995
  *
4996
4996
  * ```ts
@@ -5395,6 +5395,8 @@ declare class Select {
5395
5395
 
5396
5396
  declare class SqlMethod<ColumnTypes> {
5397
5397
  /**
5398
+ * @deprecated: use `sql` exported from the `createBaseTable` (see "define a base table" in the docs)
5399
+ *
5398
5400
  * When there is a need to use a piece of raw SQL, use the `sql` exported from the `BaseTable` file, it is also attached to query objects for convenience.
5399
5401
  *
5400
5402
  * When selecting a custom SQL, specify a resulting type with `<generic>` syntax:
@@ -5530,7 +5532,6 @@ declare class SqlMethod<ColumnTypes> {
5530
5532
  * sql`($one + $two) / $one`.type((t) => t.numeric()).values({ one: 1, two: 2 });
5531
5533
  * ```
5532
5534
  *
5533
- * @deprecated use `sql` exported from the `createBaseTable` (see "define a base table" in the docs)
5534
5535
  * @param args - template literal or an object { raw: string }
5535
5536
  * @return object that has `type` and `values` methods
5536
5537
  */
@@ -8149,8 +8150,9 @@ interface ColumnsByType {
8149
8150
  declare const makeColumnsByType: (schema: ColumnSchemaConfig) => ColumnsByType;
8150
8151
 
8151
8152
  type Value = any;
8152
- declare const quote: (value: Value) => string;
8153
- declare const quoteString: (value: string) => string;
8153
+ declare const escapeForLog: (value: Value) => string;
8154
+ declare const escapeForMigration: (value: Value) => string;
8155
+ declare const escapeString: (value: string) => string;
8154
8156
 
8155
8157
  /**
8156
8158
  * Push all elements of given array into the array in the query data,
@@ -8322,4 +8324,4 @@ type CopyResult<T extends PickQueryMeta> = SetQueryKind<T, 'copy'>;
8322
8324
  */
8323
8325
  declare function copyTableData<T extends PickQueryMetaShape>(query: T, arg: CopyArg<T>): CopyResult<T>;
8324
8326
 
8325
- export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AfterCommitError, AfterCommitErrorFulfilledResult, AfterCommitErrorRejectedResult, AfterCommitErrorResult, AfterHook, AggregateArgTypes, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfoQueryData, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumn, ComputedColumns, ComputedColumnsFromOptions, ComputedMethods, ComputedOptionsFactory, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateResult, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, FromArg, FromMethods, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArgs, HandleResult, Having, HavingItem, HookAction, HookSelectArg, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgToQuery, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, NumericColumns, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryColumnTypes, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryMetaWithDataColumnTypes, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryResultColumnTypes, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBatchResult, QueryBeforeHook, QueryComputedArg, QueryData, QueryDataFromItem, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHooks, QueryInternal, QueryLog, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryOrExpression, QueryOrExpressionBooleanOrNullResult, QueryResult, QueryScopeData, QueryScopes, QuerySourceItem, QueryUpsertOrCreate, QueryWithTable, RawSQL, RealColumn, RecordOfColumnsShapeBase, RefExpression, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, RuntimeComputedQueryColumn, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectArgs, SelectAs, SelectAsValue, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SelectableOrExpressions, SerialColumn, SerialColumnData, SetQueryKind, SetQueryKindResult, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsAllKindResult, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnKindResult, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneKindResult, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsPluckColumnKindResult, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArgs, UnionItem, UnionKind, UnionSet, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, WithArgsOptions, WithConfigs, WithDataItem, WithDataItems, WithItem, WithMethods, WithOptions, WithQueryBuilder, WithRecursiveOptions, WithResult, WithSqlResult, WrapQueryArg, XMLColumn, _afterCommitError, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
8327
+ export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AfterCommitError, AfterCommitErrorFulfilledResult, AfterCommitErrorRejectedResult, AfterCommitErrorResult, AfterHook, AggregateArgTypes, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfoQueryData, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumn, ComputedColumns, ComputedColumnsFromOptions, ComputedMethods, ComputedOptionsFactory, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateResult, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, FromArg, FromMethods, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArgs, HandleResult, Having, HavingItem, HookAction, HookSelectArg, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgToQuery, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, NumericColumns, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryColumnTypes, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryMetaWithDataColumnTypes, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryResultColumnTypes, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBatchResult, QueryBeforeHook, QueryComputedArg, QueryData, QueryDataFromItem, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHooks, QueryInternal, QueryLog, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryOrExpression, QueryOrExpressionBooleanOrNullResult, QueryResult, QueryScopeData, QueryScopes, QuerySourceItem, QueryUpsertOrCreate, QueryWithTable, RawSQL, RealColumn, RecordOfColumnsShapeBase, RefExpression, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, RuntimeComputedQueryColumn, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectArgs, SelectAs, SelectAsValue, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SelectableOrExpressions, SerialColumn, SerialColumnData, SetQueryKind, SetQueryKindResult, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsAllKindResult, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnKindResult, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneKindResult, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsPluckColumnKindResult, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArgs, UnionItem, UnionKind, UnionSet, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, WithArgsOptions, WithConfigs, WithDataItem, WithDataItems, WithItem, WithMethods, WithOptions, WithQueryBuilder, WithRecursiveOptions, WithResult, WithSqlResult, WrapQueryArg, XMLColumn, _afterCommitError, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
package/dist/index.js CHANGED
@@ -921,7 +921,7 @@ const makeVarArg = (_op) => {
921
921
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
922
922
  );
923
923
  };
924
- const quoteValue$1 = (arg, ctx, quotedAs, jsonArray) => {
924
+ const quoteValue = (arg, ctx, quotedAs, jsonArray) => {
925
925
  if (arg && typeof arg === "object") {
926
926
  if (!jsonArray && Array.isArray(arg)) {
927
927
  return `(${arg.map((value) => orchidCore.addValue(ctx.values, value)).join(", ")})`;
@@ -953,16 +953,16 @@ const quoteLikeValue = (arg, ctx, quotedAs, jsonArray) => {
953
953
  };
954
954
  const base = {
955
955
  equals: make(
956
- (key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue$1(value, ctx, quotedAs)}`
956
+ (key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue(value, ctx, quotedAs)}`
957
957
  ),
958
958
  not: make(
959
- (key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue$1(value, ctx, quotedAs)}`
959
+ (key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue(value, ctx, quotedAs)}`
960
960
  ),
961
961
  in: make(
962
- (key, value, ctx, quotedAs) => `${key} IN ${quoteValue$1(value, ctx, quotedAs)}`
962
+ (key, value, ctx, quotedAs) => `${key} IN ${quoteValue(value, ctx, quotedAs)}`
963
963
  ),
964
964
  notIn: make(
965
- (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue$1(value, ctx, quotedAs)}`
965
+ (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
966
966
  )
967
967
  };
968
968
  const boolean = __spreadProps$b(__spreadValues$k({}, base), {
@@ -975,19 +975,19 @@ const boolean = __spreadProps$b(__spreadValues$k({}, base), {
975
975
  });
976
976
  const numeric = __spreadProps$b(__spreadValues$k({}, base), {
977
977
  lt: make(
978
- (key, value, ctx, quotedAs) => `${key} < ${quoteValue$1(value, ctx, quotedAs)}`
978
+ (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
979
979
  ),
980
980
  lte: make(
981
- (key, value, ctx, quotedAs) => `${key} <= ${quoteValue$1(value, ctx, quotedAs)}`
981
+ (key, value, ctx, quotedAs) => `${key} <= ${quoteValue(value, ctx, quotedAs)}`
982
982
  ),
983
983
  gt: make(
984
- (key, value, ctx, quotedAs) => `${key} > ${quoteValue$1(value, ctx, quotedAs)}`
984
+ (key, value, ctx, quotedAs) => `${key} > ${quoteValue(value, ctx, quotedAs)}`
985
985
  ),
986
986
  gte: make(
987
- (key, value, ctx, quotedAs) => `${key} >= ${quoteValue$1(value, ctx, quotedAs)}`
987
+ (key, value, ctx, quotedAs) => `${key} >= ${quoteValue(value, ctx, quotedAs)}`
988
988
  ),
989
989
  between: make(
990
- (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue$1(from, ctx, quotedAs)} AND ${quoteValue$1(
990
+ (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue(from, ctx, quotedAs)} AND ${quoteValue(
991
991
  to,
992
992
  ctx,
993
993
  quotedAs
@@ -1041,10 +1041,10 @@ const json = __spreadProps$b(__spreadValues$k({}, base), {
1041
1041
  { _op: jsonPathQueryOp }
1042
1042
  ),
1043
1043
  jsonSupersetOf: make(
1044
- (key, value, ctx, quotedAs) => `${key} @> ${quoteValue$1(value, ctx, quotedAs, true)}`
1044
+ (key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs, true)}`
1045
1045
  ),
1046
1046
  jsonSubsetOf: make(
1047
- (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue$1(value, ctx, quotedAs, true)}`
1047
+ (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs, true)}`
1048
1048
  ),
1049
1049
  jsonSet: makeVarArg(
1050
1050
  (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${orchidCore.addValue(
@@ -3182,25 +3182,26 @@ const defaultSchemaConfig = {
3182
3182
  timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision)
3183
3183
  };
3184
3184
 
3185
- const quoteValue = (value, nested = false) => {
3185
+ const escape = (value, migration, nested) => {
3186
3186
  const type = typeof value;
3187
3187
  if (type === "number" || type === "bigint")
3188
3188
  return String(value);
3189
3189
  else if (type === "string")
3190
- return quoteString(value);
3190
+ return escapeString(value);
3191
3191
  else if (type === "boolean")
3192
3192
  return value ? "true" : "false";
3193
3193
  else if (value instanceof Date)
3194
3194
  return `'${value.toISOString()}'`;
3195
3195
  else if (Array.isArray(value))
3196
- return `${nested ? "" : "ARRAY"}[${value.map((el) => quoteValue(el, true)).join(",")}]`;
3196
+ return migration && nested && !value.length ? "" : (migration ? "{" : nested ? "[" : "ARRAY[") + value.map((el) => escape(el, migration, true)).join(",") + (migration ? "}" : "]");
3197
3197
  else if (value === null || value === void 0)
3198
3198
  return "NULL";
3199
3199
  else
3200
- return quoteString(JSON.stringify(value));
3200
+ return escapeString(JSON.stringify(value));
3201
3201
  };
3202
- const quote = (value) => quoteValue(value);
3203
- const quoteString = (value) => `'${value.replaceAll("'", "''")}'`;
3202
+ const escapeForLog = (value) => escape(value);
3203
+ const escapeForMigration = (value) => escape(value, true);
3204
+ const escapeString = (value) => `'${value.replaceAll("'", "''")}'`;
3204
3205
 
3205
3206
  const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values) => {
3206
3207
  const elapsed = process.hrtime(time);
@@ -3209,7 +3210,7 @@ const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values
3209
3210
  if (!(values == null ? void 0 : values.length)) {
3210
3211
  return result;
3211
3212
  }
3212
- const formattedValues = `[${values.map(quote).join(", ")}]`;
3213
+ const formattedValues = `[${values.map(escapeForLog).join(", ")}]`;
3213
3214
  return `${result} ${colors ? valuesColor(formattedValues) : formattedValues}`;
3214
3215
  };
3215
3216
  const logParamToLogObject = (logger, log) => {
@@ -4242,7 +4243,7 @@ const addParserForSelectItem = (q, as, key, arg) => {
4242
4243
  let returnType = originalReturnType;
4243
4244
  const { hookSelect } = query;
4244
4245
  const batches = [];
4245
- let last = path.length;
4246
+ const last = path.length;
4246
4247
  if (returnType === "value" || returnType === "valueOrThrow") {
4247
4248
  if (hookSelect) {
4248
4249
  batches.push = (item) => {
@@ -4252,8 +4253,6 @@ const addParserForSelectItem = (q, as, key, arg) => {
4252
4253
  batches.push = Array.prototype.push;
4253
4254
  return batches.push(item);
4254
4255
  };
4255
- } else {
4256
- last--;
4257
4256
  }
4258
4257
  }
4259
4258
  collectNestedSelectBatches(batches, rows, path, last);
@@ -4314,19 +4313,19 @@ const addParserForSelectItem = (q, as, key, arg) => {
4314
4313
  const parse = (_b2 = query.parsers) == null ? void 0 : _b2[orchidCore.getValueKey];
4315
4314
  if (parse) {
4316
4315
  if (returnType === "value") {
4317
- for (const { data } of batches) {
4318
- data[key] = data[key] === void 0 ? arg.q.notFoundDefault : parse(data[key]);
4316
+ for (const item of batches) {
4317
+ item.parent[item.key] = item.data = item.data === void 0 ? arg.q.notFoundDefault : parse(item.data);
4319
4318
  }
4320
4319
  } else {
4321
- for (const { data } of batches) {
4322
- if (data[key] === void 0)
4320
+ for (const item of batches) {
4321
+ if (item.data === void 0)
4323
4322
  throw new NotFoundError(arg);
4324
- data[key] = parse(data[key]);
4323
+ item.parent[item.key] = item.data = parse(item.data);
4325
4324
  }
4326
4325
  }
4327
4326
  } else if (returnType !== "value") {
4328
4327
  for (const { data } of batches) {
4329
- if (data[key] === void 0)
4328
+ if (data === void 0)
4330
4329
  throw new NotFoundError(arg);
4331
4330
  }
4332
4331
  }
@@ -4395,7 +4394,9 @@ const collectNestedSelectBatches = (batches, rows, path, last) => {
4395
4394
  const stack = rows.map(
4396
4395
  (row) => ({
4397
4396
  data: row,
4398
- i: 0
4397
+ parent: row,
4398
+ i: 0,
4399
+ key: path[0]
4399
4400
  })
4400
4401
  );
4401
4402
  while (stack.length > 0) {
@@ -5827,7 +5828,7 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
5827
5828
  }).join(", ")})` : "";
5828
5829
  const target = "from" in copy ? copy.from : copy.to;
5829
5830
  sql.push(
5830
- `COPY "${table.table}"${columns} ${"from" in copy ? "FROM" : "TO"} ${typeof target === "string" ? quoteString(target) : `PROGRAM ${quoteString(target.program)}`}`
5831
+ `COPY "${table.table}"${columns} ${"from" in copy ? "FROM" : "TO"} ${typeof target === "string" ? escapeString(target) : `PROGRAM ${escapeString(target.program)}`}`
5831
5832
  );
5832
5833
  if (Object.keys(copy).length > (copy.columns ? 2 : 1)) {
5833
5834
  const options = [];
@@ -5836,15 +5837,15 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
5836
5837
  if (copy.freeze)
5837
5838
  options.push(`FREEZE ${copy.freeze}`);
5838
5839
  if (copy.delimiter)
5839
- options.push(`DELIMITER ${quoteString(copy.delimiter)}`);
5840
+ options.push(`DELIMITER ${escapeString(copy.delimiter)}`);
5840
5841
  if (copy.null)
5841
- options.push(`NULL ${quoteString(copy.null)}`);
5842
+ options.push(`NULL ${escapeString(copy.null)}`);
5842
5843
  if (copy.header)
5843
5844
  options.push(`HEADER ${copy.header}`);
5844
5845
  if (copy.quote)
5845
- options.push(`QUOTE ${quoteString(copy.quote)}`);
5846
+ options.push(`QUOTE ${escapeString(copy.quote)}`);
5846
5847
  if (copy.escape)
5847
- options.push(`ESCAPE ${quoteString(copy.escape)}`);
5848
+ options.push(`ESCAPE ${escapeString(copy.escape)}`);
5848
5849
  if (copy.forceQuote)
5849
5850
  options.push(
5850
5851
  `FORCE_QUOTE ${copy.forceQuote === "*" ? "*" : `(${copy.forceQuote.map((x) => `"${x}"`).join(", ")})`}`
@@ -5858,7 +5859,7 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
5858
5859
  `FORCE_NULL (${copy.forceNull.map((x) => `"${x}"`).join(", ")})`
5859
5860
  );
5860
5861
  if (copy.encoding)
5861
- options.push(`ENCODING ${quoteString(copy.encoding)}`);
5862
+ options.push(`ENCODING ${escapeString(copy.encoding)}`);
5862
5863
  sql.push(`WITH (${options.join(", ")})`);
5863
5864
  }
5864
5865
  pushWhereStatementSql(ctx, table, query, quotedAs);
@@ -13171,6 +13172,9 @@ exports.copyTableData = copyTableData;
13171
13172
  exports.countSelect = countSelect;
13172
13173
  exports.createDb = createDb;
13173
13174
  exports.defaultSchemaConfig = defaultSchemaConfig;
13175
+ exports.escapeForLog = escapeForLog;
13176
+ exports.escapeForMigration = escapeForMigration;
13177
+ exports.escapeString = escapeString;
13174
13178
  exports.extendQuery = extendQuery;
13175
13179
  exports.filterResult = filterResult;
13176
13180
  exports.foreignKeyArgumentToCode = foreignKeyArgumentToCode;
@@ -13216,8 +13220,6 @@ exports.queryJson = queryJson;
13216
13220
  exports.queryMethodByReturnType = queryMethodByReturnType;
13217
13221
  exports.queryTypeWithLimitOne = queryTypeWithLimitOne;
13218
13222
  exports.queryWrap = queryWrap;
13219
- exports.quote = quote;
13220
- exports.quoteString = quoteString;
13221
13223
  exports.raw = raw;
13222
13224
  exports.referencesArgsToCode = referencesArgsToCode;
13223
13225
  exports.resolveSubQueryCallback = resolveSubQueryCallback;