pqb 0.54.0 → 0.54.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import * as orchid_core from 'orchid-core';
-import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, IsQuery, PickQueryTableMetaResult, PickQueryShape, PickQueryTable, PickQueryMetaReturnType, RecordUnknown, Expression, MaybeArray, ColumnTypesBase, TemplateLiteralArgs, QueryColumn, EmptyObject, QueryColumns, MaybePromise, FnUnknownToUnknown, QueryMetaBase, QueryReturnType, RecordString, ColumnsShapeBase, ColumnsParsers, HookSelect, BatchParsers, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, ColumnSchemaConfig, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, ExpressionData, StaticSQLArgs, SQLQueryArgs, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, QueryThenByQuery, ColumnShapeInput, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ValExpression, PickOutputType, QueryThen, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ColumnTypeBase, ParseColumn, ParseNullColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DefaultSelectOutput, QueryThenShallowSimplifyArr, QueryCatch, TransactionState, QueryColumnOfDataType, PickQueryUniqueProperties, PickQueryMetaResult, PickQueryTableMetaResultInputType, UnionToIntersection, AfterCommitStandaloneHook, getValueKey, QueryThenByReturnType, QueryMetaIsSubQuery, PickQueryReturnType, QueryReturnTypeAll, QueryReturnTypeOptional, QueryThenShallowSimplifyOptional, QueryThenShallowSimplify, PickQueryResultReturnType, PickQueryResultReturnTypeUniqueColumns, PickQueryTableMetaShape, QueryInternalBase, PickType, RecordKeyTrue, ColumnShapeOutput, OperatorsNullable, UniqueColumn, TimestampHelpers, ShallowSimplify, Codes, ColumnDataCheckBase } from 'orchid-core';
+import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, IsQuery, PickQueryTableMetaResult, PickQueryShape, PickQueryTable, PickQueryMetaReturnType, RecordUnknown, Expression, MaybeArray, ColumnTypesBase, TemplateLiteralArgs, QueryColumn, EmptyObject, QueryColumns, MaybePromise, FnUnknownToUnknown, QueryMetaBase, QueryReturnType, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryInputType, HookSelect, BatchParsers, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, ColumnSchemaConfig, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, ExpressionData, StaticSQLArgs, SQLQueryArgs, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, QueryThenByQuery, ColumnShapeInput, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ValExpression, PickOutputType, QueryThen, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ColumnTypeBase, ParseColumn, ParseNullColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DefaultSelectOutput, QueryThenShallowSimplifyArr, QueryCatch, TransactionState, QueryColumnOfDataType, PickQueryUniqueProperties, PickQueryMetaResult, PickQueryTableMetaResultInputType, UnionToIntersection, AfterCommitStandaloneHook, getValueKey, QueryThenByReturnType, QueryMetaIsSubQuery, PickQueryReturnType, QueryReturnTypeAll, QueryReturnTypeOptional, QueryThenShallowSimplifyOptional, QueryThenShallowSimplify, PickQueryResultReturnType, PickQueryResultReturnTypeUniqueColumns, PickQueryTableMetaShape, QueryInternalBase, PickType, RecordKeyTrue, ColumnShapeOutput, OperatorsNullable, UniqueColumn, TimestampHelpers, ShallowSimplify, Codes, ColumnDataCheckBase } from 'orchid-core';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { QueryResult as QueryResult$1, QueryBuilder as QueryBuilder$1, QueryInternal as QueryInternal$1, Adapter as Adapter$1, QueryData as QueryData$1 } from 'pqb';
@@ -336,7 +336,8 @@ type JoinedShapes = RecordOfColumnsShapeBase;
 interface JoinedParsers {
     [K: string]: ColumnsParsers | undefined;
 }
-type QueryBeforeHook = (query: Query) => void | Promise<void>;
+type QueryBeforeHookInternal = (query: Query) => void | Promise<void>;
+type QueryBeforeHook = (utils: QueryHookUtils<PickQueryInputType>) => void | Promise<void>;
 type QueryAfterHook<Data = unknown> = (data: Data, query: Query) => unknown | Promise<unknown>;
 interface QueryScopes {
     [K: string]: QueryScopeData;
@@ -415,17 +416,17 @@ interface CommonQueryData {
     hookSelect?: HookSelect;
     computeds?: ComputedColumns;
     selectedComputeds?: ComputedColumns;
-    before?: QueryBeforeHook[];
+    before?: QueryBeforeHookInternal[];
     after?: QueryAfterHook[];
-    beforeCreate?: QueryBeforeHook[];
+    beforeCreate?: QueryBeforeHookInternal[];
     afterCreate?: QueryAfterHook[];
     afterCreateCommit?: QueryAfterHook[];
     afterCreateSelect?: Set<string>;
-    beforeUpdate?: QueryBeforeHook[];
+    beforeUpdate?: QueryBeforeHookInternal[];
     afterUpdate?: QueryAfterHook[];
     afterUpdateCommit?: QueryAfterHook[];
     afterUpdateSelect?: Set<string>;
-    beforeDelete?: QueryBeforeHook[];
+    beforeDelete?: QueryBeforeHookInternal[];
     afterDelete?: QueryAfterHook[];
     afterDeleteCommit?: QueryAfterHook[];
     afterDeleteSelect?: Set<string>;
@@ -460,6 +461,8 @@ interface CommonQueryData {
         targetHookSelect: HookSelect;
     };
     outerQuery?: Query;
+    hookCreateSet?: RecordUnknown[];
+    hookUpdateSet?: RecordUnknown[];
 }
 interface SelectQueryData extends CommonQueryData {
     type: undefined | 'upsert';
@@ -482,15 +485,10 @@ interface SelectQueryData extends CommonQueryData {
         mode?: 'NO WAIT' | 'SKIP LOCKED';
     };
 }
-type CreateKind = 'object' | 'from';
 interface InsertQueryData extends CommonQueryData {
     type: 'insert';
-    kind: CreateKind;
     columns: string[];
-    values: unknown[][] | {
-        from: Query;
-        values?: unknown[][];
-    };
+    values: InsertQueryDataObjectValues | InsertQueryDataFromValues;
     join?: JoinItem[];
     onConflict?: {
         target?: OnConflictTarget;
@@ -498,6 +496,11 @@ interface InsertQueryData extends CommonQueryData {
         merge?: OnConflictMerge;
     };
 }
+type InsertQueryDataObjectValues = unknown[][];
+type InsertQueryDataFromValues = {
+    from: Query;
+    values?: unknown[];
+};
 interface UpdateQueryDataObject {
     [K: string]: Expression | {
         op: string;
@@ -5396,7 +5399,7 @@ type AfterHook<Select extends PropertyKey[], Shape extends QueryColumns> = Query
 }[]>;
 type HookSelectArg<T extends PickQueryShape> = (keyof T['shape'] & string)[];
 type HookAction = 'Create' | 'Update' | 'Delete';
-declare const _queryHookBeforeQuery: <T extends PickQueryShape>(q: T, cb: QueryBeforeHook) => T;
+declare const _queryHookBeforeQuery: <T extends PickQueryShape>(q: T, cb: QueryBeforeHookInternal) => T;
 declare const _queryHookAfterQuery: <T extends PickQueryShape>(q: T, cb: QueryAfterHook) => T;
 declare const _queryHookBeforeCreate: <T extends PickQueryShape>(q: T, cb: QueryBeforeHook) => T;
 declare const _queryHookAfterCreate: <T extends PickQueryShape, S extends HookSelectArg<T>>(q: T, select: S, cb: AfterHook<S, T['shape']>) => T;
@@ -5407,16 +5410,22 @@ declare const _queryHookAfterUpdateCommit: <T extends PickQueryShape, S extends
 declare const _queryHookBeforeSave: <T extends PickQueryShape>(q: T, cb: QueryBeforeHook) => T;
 declare const _queryHookAfterSave: <T extends PickQueryShape, S extends HookSelectArg<T>>(q: T, select: S, cb: AfterHook<S, T['shape']>) => T;
 declare const _queryAfterSaveCommit: <T extends PickQueryShape, S extends HookSelectArg<T>>(q: T, select: S, cb: AfterHook<S, T['shape']>) => T;
-declare const _queryHookBeforeDelete: <T extends PickQueryShape>(q: T, cb: QueryBeforeHook) => T;
+declare const _queryHookBeforeDelete: <T extends PickQueryShape>(q: T, cb: QueryBeforeHookInternal) => T;
 declare const _queryHookAfterDelete: <T extends PickQueryShape, S extends HookSelectArg<T>>(q: T, select: S, cb: AfterHook<S, T['shape']>) => T;
 declare const _queryHookAfterDeleteCommit: <T extends PickQueryShape, S extends HookSelectArg<T>>(q: T, select: S, cb: AfterHook<S, T['shape']>) => T;
+declare class QueryHookUtils<T extends PickQueryInputType> {
+    query: Query;
+    private key;
+    constructor(query: Query, key: 'hookCreateSet' | 'hookUpdateSet');
+    set: (data: { [K in keyof T["inputType"]]?: T["inputType"][K] | (() => QueryOrExpression<T["inputType"][K]>) | undefined; }) => void;
+}
 declare abstract class QueryHooks {
     /**
      * Run the function before any kind of query.
      *
      * @param cb - function to call, first argument is a query object
      */
-    beforeQuery<T>(this: T, cb: QueryBeforeHook): T;
+    beforeQuery<T>(this: T, cb: QueryBeforeHookInternal): T;
     /**
      * Run the function after any kind of query.
      * Enforces wrapping the query into a transaction.
@@ -5506,7 +5515,7 @@ declare abstract class QueryHooks {
      *
      * @param cb - function to call, first argument is a query object
      */
-    beforeDelete<T>(this: T, cb: QueryBeforeHook): T;
+    beforeDelete<T>(this: T, cb: QueryBeforeHookInternal): T;
     /**
      * Run the function after a `delete` kind of query.
      * Enforces wrapping the query into a transaction.
@@ -9002,4 +9011,4 @@ type CopyResult<T extends PickQueryMeta> = SetQueryKind<T, 'copy'>;
  */
 declare function copyTableData<T extends PickQueryMetaShape>(query: T, arg: CopyArg<T>): CopyResult<T>;
 
-export { Adapter, type AdapterConfig, type AdapterOptions, type AddQueryDefaults, AfterCommitError, type AfterCommitErrorFulfilledResult, type AfterCommitErrorHandler, type AfterCommitErrorRejectedResult, type AfterCommitErrorResult, type AfterHook, type AggregateArgTypes, AggregateMethods, type AggregateOptions, type AliasOrTable, ArrayColumn, type ArrayColumnValue, type ArrayData, AsMethods, type AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, type BooleanQueryColumn, BoxColumn, ByteaColumn, type ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, type ClearStatement, type ColumnData, type ColumnDataGenerated, type ColumnFromDbParams, type ColumnInfoQueryData, ColumnRefExpression, ColumnType, type ColumnsByType, type ColumnsShape, type ColumnsShapeToNullableObject, type ColumnsShapeToObject, type ColumnsShapeToObjectArray, type ColumnsShapeToPluck, type CommonQueryData, ComputedColumn, type ComputedColumns, type ComputedColumnsFromOptions, type ComputedMethods, type ComputedOptionsConfig, type ComputedOptionsFactory, type CopyOptions, type CopyQueryData, Create, type CreateBelongsToData, type CreateColumn, type CreateCtx, type CreateData, type CreateKind, type CreateMethodsNames, type CreateRelationsData, type CreateRelationsDataOmittingFKeys, type CreateResult, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbDomainArgRecord, type DbExtension, type DbOptions, type DbResult, type DbSharedOptions, type DbSqlQuery, type DbStructureDomainsMap, type DbTableConstructor, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultSchemaConfig, Delete, type DeleteArgs, type DeleteMethodsNames, type DeleteQueryData, type DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, type ExpressionOutput, FnExpression, type FnExpressionArgs, type FnExpressionArgsPairs, type FnExpressionArgsValue, For, type FromArg, FromMethods, type FromQuerySelf, type FromResult, type GeneratedColumn, type GeneratorIgnore, type GetArg, type GetColumnInfo, type GetResult, type GetResultOptional, type GetStringArg, type GroupArgs, type HandleResult, Having, type HavingItem, type HookAction, type HookSelectArg, type IdentityColumn, InetColumn, type InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsolationLevel, JSONColumn, JSONTextColumn, Join, type JoinArgToQuery, type JoinArgs, type JoinCallback, type JoinFirstArg, type JoinItem, type JoinItemArgs, type JoinLateralResult, type JoinQueryBuilder, type JoinQueryMethod, type JoinResult, type JoinResultRequireMain, type JoinedParsers, type JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, type NumericColumns, type OnConflictMerge, OnConflictQueryBuilder, type OnConflictSet$1 as OnConflictSet, type OnConflictTarget, OnMethods, type Operator, Operators, type OperatorsAny, type OperatorsArray, type OperatorsBoolean, type OperatorsDate, type OperatorsJson, type OperatorsNumber, type OperatorsText, type OperatorsTime, type OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, type OrderArg, type OrderArgSelf, type OrderArgs, type OrderItem, type OrderTsQueryConfig, type Over, PathColumn, type PickColumnData, type PickQueryBaseQuery, type PickQueryColumnTypes, type PickQueryDataShapeAndJoinedShapes, type PickQueryDataShapeAndJoinedShapesAndAliases, type PickQueryInternal, type PickQueryMetaColumnTypes, type PickQueryMetaRelations, type PickQueryMetaRelationsResult, type PickQueryMetaRelationsResultReturnType, type PickQueryMetaRelationsReturnType, type PickQueryMetaResultRelations, type PickQueryMetaResultRelationsWindows, type PickQueryMetaResultRelationsWindowsColumnTypes, type PickQueryMetaResultRelationsWithDataReturnType, type PickQueryMetaResultRelationsWithDataReturnTypeShape, type PickQueryMetaResultReturnTypeWithDataWindows, type PickQueryMetaResultReturnTypeWithDataWindowsThen, type PickQueryMetaShapeRelationsReturnType, type PickQueryMetaShapeRelationsWithData, type PickQueryMetaTable, type PickQueryMetaTableShape, type PickQueryMetaTableShapeReturnTypeWithData, type PickQueryMetaWithData, type PickQueryMetaWithDataColumnTypes, type PickQueryQ, type PickQueryQAndBaseQuery, type PickQueryQAndInternal, type PickQueryRelationQueries, type PickQueryRelations, type PickQueryRelationsWithData, type PickQueryResultColumnTypes, type PickQueryShapeResultReturnTypeSinglePrimaryKey, type PickQueryShapeResultSinglePrimaryKey, type PickQueryShapeSinglePrimaryKey, type PickQuerySinglePrimaryKey, type PickQueryTableMetaResultReturnTypeWithDataWindowsThen, type PickQueryWindows, type PickQueryWithData, type PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type PostgisPoint, type Queries, type Query, type QueryAfterHook, type QueryArraysResult, type QueryBatchResult, type QueryBeforeHook, type QueryBuilder, type QueryComputedArg, type QueryData, type QueryDataFromItem, type QueryDataJoinTo, type QueryDefaultReturnData, QueryError, type QueryErrorName, QueryGet, type QueryGetSelf, type QueryHelperResult, QueryHooks, type QueryIfResultThen, type QueryInternal, QueryLog, type QueryMetaHasSelect, type QueryMetaHasWhere, QueryMethods, type QueryOrExpression, type QueryOrExpressionBooleanOrNullResult, type QueryResult, type QueryScopeData, type QueryScopes, type QuerySourceItem, type QueryTake, type QueryTakeOptional, QueryUpsertOrCreate, RawSQL, RealColumn, type RecordOfColumnsShapeBase, RefExpression, type RelationConfigBase, type RelationConfigDataForCreate, type RelationConfigQuery, type RelationJoinQuery, type RelationsBase, type ReturnsQueryOrExpression, type RuntimeComputedQueryColumn, type SearchArg, SearchMethods, type SearchWeight, type SearchWeightRecord, Select, type SelectArg, type SelectArgs, type SelectAs, type SelectAsValue, type SelectItem, type SelectQueryData, type SelectSubQueryResult, type SelectableFromShape, type SelectableOfType, type SelectableOrExpression, type SelectableOrExpressionOfType, type SelectableOrExpressions, SerialColumn, type SerialColumnData, type SetQueryKind, type SetQueryKindResult, type SetQueryReturnsAll, type SetQueryReturnsAllKind, type SetQueryReturnsAllKindResult, type SetQueryReturnsColumnInfo, type SetQueryReturnsColumnKind, type SetQueryReturnsColumnKindResult, type SetQueryReturnsColumnOptional, type SetQueryReturnsColumnOrThrow, type SetQueryReturnsOneKind, type SetQueryReturnsOneKindResult, type SetQueryReturnsPluck, type SetQueryReturnsPluckColumn, type SetQueryReturnsPluckColumnKind, type SetQueryReturnsPluckColumnKindResult, type SetQueryReturnsRowCount, type SetQueryReturnsRowCountMany, type SetQueryReturnsRows, type SetQueryReturnsValueOptional, type SetQueryReturnsValueOrThrow, type SetQueryReturnsVoid, type SetQueryReturnsVoidKind, type SetQueryTableAlias, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, type SortDir, type SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, TextBaseColumn, TextColumn, type TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, type ToSQLCtx, type ToSQLOptions, type ToSQLQuery, Transaction, TransactionAdapter, type TransactionOptions, TransformMethods, type TruncateQueryData, TsQueryColumn, TsVectorColumn, type TypeParsers, UUIDColumn, UnhandledTypeError, Union, type UnionArgs, type UnionItem, type UnionKind, type UnionSet, type UniqueConstraints, type UniqueQueryTypeOrExpression, type UniqueTableDataItem, UnknownColumn, Update, type UpdateArg, type UpdateCtx, type UpdateCtxCollect, type UpdateData, type UpdateQueryData, type UpdateQueryDataItem, type UpdateQueryDataObject, type UpdateSelf, type UpdatedAtDataInjector, type UpsertResult, type UpsertThis, VarCharColumn, VirtualColumn, Where, type WhereArg, type WhereArgs, type WhereInArg, type WhereInColumn, type WhereInItem, type WhereInValues, type WhereItem, type WhereJsonPathEqualsItem, type WhereNotArgs, type WhereOnItem, type WhereOnJoinItem, type WhereQueryBuilder, type WhereResult, type WhereSearchItem, type WhereSearchResult, type WindowArg, type WindowArgDeclaration, type WindowDeclaration, type WindowItem, type WithArgsOptions, type WithConfigs, type WithDataItem, type WithDataItems, type WithItem, type WithItems, WithMethods, type WithOptions, type WithQueryBuilder, type WithRecursiveOptions, type WithResult, type WithSqlResult, type WrapQueryArg, XMLColumn, _clone, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _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, _queryResolveAlias, _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, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, isDefaultTimeStamp, isInUserTransaction, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, moveQueryValueToWith, parseRecord, parseTableData, parseTableDataInput, performQuery, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, 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 };
+export { Adapter, type AdapterConfig, type AdapterOptions, type AddQueryDefaults, AfterCommitError, type AfterCommitErrorFulfilledResult, type AfterCommitErrorHandler, type AfterCommitErrorRejectedResult, type AfterCommitErrorResult, type AfterHook, type AggregateArgTypes, AggregateMethods, type AggregateOptions, type AliasOrTable, ArrayColumn, type ArrayColumnValue, type ArrayData, AsMethods, type AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, type BooleanQueryColumn, BoxColumn, ByteaColumn, type ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, type ClearStatement, type ColumnData, type ColumnDataGenerated, type ColumnFromDbParams, type ColumnInfoQueryData, ColumnRefExpression, ColumnType, type ColumnsByType, type ColumnsShape, type ColumnsShapeToNullableObject, type ColumnsShapeToObject, type ColumnsShapeToObjectArray, type ColumnsShapeToPluck, type CommonQueryData, ComputedColumn, type ComputedColumns, type ComputedColumnsFromOptions, type ComputedMethods, type ComputedOptionsConfig, type ComputedOptionsFactory, type CopyOptions, type CopyQueryData, Create, type CreateBelongsToData, type CreateColumn, type CreateCtx, type CreateData, type CreateMethodsNames, type CreateRelationsData, type CreateRelationsDataOmittingFKeys, type CreateResult, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbDomainArgRecord, type DbExtension, type DbOptions, type DbResult, type DbSharedOptions, type DbSqlQuery, type DbStructureDomainsMap, type DbTableConstructor, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultSchemaConfig, Delete, type DeleteArgs, type DeleteMethodsNames, type DeleteQueryData, type DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, type ExpressionOutput, FnExpression, type FnExpressionArgs, type FnExpressionArgsPairs, type FnExpressionArgsValue, For, type FromArg, FromMethods, type FromQuerySelf, type FromResult, type GeneratedColumn, type GeneratorIgnore, type GetArg, type GetColumnInfo, type GetResult, type GetResultOptional, type GetStringArg, type GroupArgs, type HandleResult, Having, type HavingItem, type HookAction, type HookSelectArg, type IdentityColumn, InetColumn, type InsertQueryData, type InsertQueryDataFromValues, type InsertQueryDataObjectValues, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsolationLevel, JSONColumn, JSONTextColumn, Join, type JoinArgToQuery, type JoinArgs, type JoinCallback, type JoinFirstArg, type JoinItem, type JoinItemArgs, type JoinLateralResult, type JoinQueryBuilder, type JoinQueryMethod, type JoinResult, type JoinResultRequireMain, type JoinedParsers, type JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, type NumericColumns, type OnConflictMerge, OnConflictQueryBuilder, type OnConflictSet$1 as OnConflictSet, type OnConflictTarget, OnMethods, type Operator, Operators, type OperatorsAny, type OperatorsArray, type OperatorsBoolean, type OperatorsDate, type OperatorsJson, type OperatorsNumber, type OperatorsText, type OperatorsTime, type OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, type OrderArg, type OrderArgSelf, type OrderArgs, type OrderItem, type OrderTsQueryConfig, type Over, PathColumn, type PickColumnData, type PickQueryBaseQuery, type PickQueryColumnTypes, type PickQueryDataShapeAndJoinedShapes, type PickQueryDataShapeAndJoinedShapesAndAliases, type PickQueryInternal, type PickQueryMetaColumnTypes, type PickQueryMetaRelations, type PickQueryMetaRelationsResult, type PickQueryMetaRelationsResultReturnType, type PickQueryMetaRelationsReturnType, type PickQueryMetaResultRelations, type PickQueryMetaResultRelationsWindows, type PickQueryMetaResultRelationsWindowsColumnTypes, type PickQueryMetaResultRelationsWithDataReturnType, type PickQueryMetaResultRelationsWithDataReturnTypeShape, type PickQueryMetaResultReturnTypeWithDataWindows, type PickQueryMetaResultReturnTypeWithDataWindowsThen, type PickQueryMetaShapeRelationsReturnType, type PickQueryMetaShapeRelationsWithData, type PickQueryMetaTable, type PickQueryMetaTableShape, type PickQueryMetaTableShapeReturnTypeWithData, type PickQueryMetaWithData, type PickQueryMetaWithDataColumnTypes, type PickQueryQ, type PickQueryQAndBaseQuery, type PickQueryQAndInternal, type PickQueryRelationQueries, type PickQueryRelations, type PickQueryRelationsWithData, type PickQueryResultColumnTypes, type PickQueryShapeResultReturnTypeSinglePrimaryKey, type PickQueryShapeResultSinglePrimaryKey, type PickQueryShapeSinglePrimaryKey, type PickQuerySinglePrimaryKey, type PickQueryTableMetaResultReturnTypeWithDataWindowsThen, type PickQueryWindows, type PickQueryWithData, type PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type PostgisPoint, type Queries, type Query, type QueryAfterHook, type QueryArraysResult, type QueryBatchResult, type QueryBeforeHook, type QueryBeforeHookInternal, type QueryBuilder, type QueryComputedArg, type QueryData, type QueryDataFromItem, type QueryDataJoinTo, type QueryDefaultReturnData, QueryError, type QueryErrorName, QueryGet, type QueryGetSelf, type QueryHelperResult, QueryHookUtils, QueryHooks, type QueryIfResultThen, type QueryInternal, QueryLog, type QueryMetaHasSelect, type QueryMetaHasWhere, QueryMethods, type QueryOrExpression, type QueryOrExpressionBooleanOrNullResult, type QueryResult, type QueryScopeData, type QueryScopes, type QuerySourceItem, type QueryTake, type QueryTakeOptional, QueryUpsertOrCreate, RawSQL, RealColumn, type RecordOfColumnsShapeBase, RefExpression, type RelationConfigBase, type RelationConfigDataForCreate, type RelationConfigQuery, type RelationJoinQuery, type RelationsBase, type ReturnsQueryOrExpression, type RuntimeComputedQueryColumn, type SearchArg, SearchMethods, type SearchWeight, type SearchWeightRecord, Select, type SelectArg, type SelectArgs, type SelectAs, type SelectAsValue, type SelectItem, type SelectQueryData, type SelectSubQueryResult, type SelectableFromShape, type SelectableOfType, type SelectableOrExpression, type SelectableOrExpressionOfType, type SelectableOrExpressions, SerialColumn, type SerialColumnData, type SetQueryKind, type SetQueryKindResult, type SetQueryReturnsAll, type SetQueryReturnsAllKind, type SetQueryReturnsAllKindResult, type SetQueryReturnsColumnInfo, type SetQueryReturnsColumnKind, type SetQueryReturnsColumnKindResult, type SetQueryReturnsColumnOptional, type SetQueryReturnsColumnOrThrow, type SetQueryReturnsOneKind, type SetQueryReturnsOneKindResult, type SetQueryReturnsPluck, type SetQueryReturnsPluckColumn, type SetQueryReturnsPluckColumnKind, type SetQueryReturnsPluckColumnKindResult, type SetQueryReturnsRowCount, type SetQueryReturnsRowCountMany, type SetQueryReturnsRows, type SetQueryReturnsValueOptional, type SetQueryReturnsValueOrThrow, type SetQueryReturnsVoid, type SetQueryReturnsVoidKind, type SetQueryTableAlias, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, type SortDir, type SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, TextBaseColumn, TextColumn, type TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, type ToSQLCtx, type ToSQLOptions, type ToSQLQuery, Transaction, TransactionAdapter, type TransactionOptions, TransformMethods, type TruncateQueryData, TsQueryColumn, TsVectorColumn, type TypeParsers, UUIDColumn, UnhandledTypeError, Union, type UnionArgs, type UnionItem, type UnionKind, type UnionSet, type UniqueConstraints, type UniqueQueryTypeOrExpression, type UniqueTableDataItem, UnknownColumn, Update, type UpdateArg, type UpdateCtx, type UpdateCtxCollect, type UpdateData, type UpdateQueryData, type UpdateQueryDataItem, type UpdateQueryDataObject, type UpdateSelf, type UpdatedAtDataInjector, type UpsertResult, type UpsertThis, VarCharColumn, VirtualColumn, Where, type WhereArg, type WhereArgs, type WhereInArg, type WhereInColumn, type WhereInItem, type WhereInValues, type WhereItem, type WhereJsonPathEqualsItem, type WhereNotArgs, type WhereOnItem, type WhereOnJoinItem, type WhereQueryBuilder, type WhereResult, type WhereSearchItem, type WhereSearchResult, type WindowArg, type WindowArgDeclaration, type WindowDeclaration, type WindowItem, type WithArgsOptions, type WithConfigs, type WithDataItem, type WithDataItems, type WithItem, type WithItems, WithMethods, type WithOptions, type WithQueryBuilder, type WithRecursiveOptions, type WithResult, type WithSqlResult, type WrapQueryArg, XMLColumn, _clone, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _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, _queryResolveAlias, _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, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, isDefaultTimeStamp, isInUserTransaction, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, moveQueryValueToWith, parseRecord, parseTableData, parseTableDataInput, performQuery, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, 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 };

package/dist/index.js

@@ -6240,6 +6240,8 @@ function _querySelect(q, args) {
     q.q.returnType = q.q.returningMany ? "all" : "oneOrThrow";
   } else if (returnType === "value") {
     q.q.returnType = q.q.returningMany ? "all" : "one";
+  } else if (returnType === "void") {
+    q.q.returnType = q.q.returningMany ? "all" : "oneOrThrow";
   }
   const len = args.length;
   if (!len) {
@@ -6429,7 +6431,22 @@ const pushWithSql = (ctx, items) => {
 };
 
 const makeInsertSql = (ctx, q, query, quotedAs) => {
-  const { columns, shape, inCTE } = query;
+  let { columns } = query;
+  const { shape, inCTE, hookCreateSet } = query;
+  const QueryClass = ctx.qb.constructor;
+  let values = query.values;
+  let hookSetSql;
+  if (hookCreateSet) {
+    ({ hookSetSql, columns, values } = processHookSet(
+      ctx,
+      q,
+      values,
+      hookCreateSet,
+      columns,
+      QueryClass,
+      quotedAs
+    ));
+  }
   const quotedColumns = columns.map(
     (column) => `"${shape[column]?.data.name || column}"`
   );
@@ -6444,7 +6461,6 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
       }
     }
   }
-  let values = query.values;
   if (quotedColumns.length === 0) {
     const key = Object.keys(q.shape)[0];
     if (key) {
@@ -6456,12 +6472,11 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
     }
   }
   const insertSql = `INSERT INTO ${quotedAs}${quotedColumns.length ? "(" + quotedColumns.join(", ") + ")" : ""}`;
-  if (query.kind !== "object" && query.insertWith) {
+  if ("from" in values && query.insertWith) {
     pushWithSql(ctx, Object.values(query.insertWith).flat());
   }
   const valuesPos = ctx.sql.length + 1;
   ctx.sql.push(insertSql, null);
-  const QueryClass = ctx.qb.constructor;
   if (query.onConflict) {
     ctx.sql.push("ON CONFLICT");
     const { target } = query.onConflict;
@@ -6525,7 +6540,28 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
     returning = makeReturningSql(ctx, q, query, quotedAs, 2);
   }
   if (returning.select) ctx.sql.push("RETURNING", returning.select);
-  if (query.kind === "object") {
+  if ("from" in values) {
+    const { from, values: v } = values;
+    const q2 = from.clone();
+    if (v) {
+      pushQueryValueImmutable(
+        q2,
+        "select",
+        new RawSQL(
+          encodeRow(
+            ctx,
+            ctx.values,
+            q2,
+            QueryClass,
+            v,
+            runtimeDefaults,
+            quotedAs
+          )
+        )
+      );
+    }
+    ctx.sql[valuesPos] = getSqlText(toSQL(q2, { values: ctx.values }));
+  } else {
     const valuesSql = [];
     let ctxValues = ctx.values;
     const restValuesLen = ctxValues.length;
@@ -6546,7 +6582,8 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
         QueryClass,
         values[i],
         runtimeDefaults,
-        quotedAs
+        quotedAs,
+        hookSetSql
       );
       if (!inCTE) encodedRow = "(" + encodedRow + ")";
       if (ctxValues.length > MAX_BINDING_PARAMS) {
@@ -6595,32 +6632,127 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
     if (inCTE) {
       ctx.sql[valuesPos] += ' WHERE NOT EXISTS (SELECT 1 FROM "f")';
     }
-  } else {
-    const { from, values: v } = values;
-    const q2 = from.clone();
-    if (v) {
-      pushQueryValueImmutable(
-        q2,
-        "select",
-        new RawSQL(
-          encodeRow(
+  }
+  return {
+    hookSelect: returning.hookSelect,
+    text: ctx.sql.join(" "),
+    values: ctx.values
+  };
+};
+const processHookSet = (ctx, q, values, hookCreateSet, columns, QueryClass, quotedAs) => {
+  const hookSet = {};
+  for (const item of hookCreateSet) {
+    Object.assign(hookSet, item);
+  }
+  const addHookSetColumns = Object.keys(hookSet).filter(
+    (key) => !columns.includes(key)
+  );
+  if ("from" in values) {
+    const v = { ...values };
+    const newColumns = [];
+    const originalSelect = v.from.q.select;
+    if (originalSelect) {
+      v.from = _clone(v.from);
+      const select = [];
+      for (const s of originalSelect) {
+        if (typeof s === "string" && !hookSet[s]) {
+          select.push(s);
+          newColumns.push(s);
+        } else if (typeof s === "object" && "selectAs" in s) {
+          const filtered = {};
+          for (const key in s.selectAs) {
+            if (!hookSet[key]) {
+              filtered[key] = s.selectAs[key];
+              newColumns.push(key);
+            }
+          }
+          select.push({ selectAs: filtered });
+        }
+      }
+      v.from.q.select = select;
+    }
+    let row;
+    if (v.values) {
+      const originalRow = v.values;
+      const valuesColumns = columns.slice(-originalRow.length);
+      row = [];
+      valuesColumns.forEach((c, i) => {
+        if (!hookSet[c]) {
+          newColumns.push(c);
+          row.push(originalRow[i]);
+        }
+      });
+    } else {
+      row = [];
+    }
+    v.values = row;
+    columns.forEach((column) => {
+      if (column in hookSet) {
+        newColumns.push(column);
+        const fromHook = {
+          fromHook: encodeValue(
             ctx,
             ctx.values,
-            q2,
+            q,
             QueryClass,
-            v[0],
-            runtimeDefaults,
+            hookSet[column],
             quotedAs
           )
-        )
-      );
+        };
+        row.push(fromHook);
+      }
+    });
+    if (addHookSetColumns) {
+      for (const key of addHookSetColumns) {
+        row.push({
+          fromHook: encodeValue(
+            ctx,
+            ctx.values,
+            q,
+            QueryClass,
+            hookSet[key],
+            quotedAs
+          )
+        });
+      }
+      return {
+        columns: [...newColumns, ...addHookSetColumns],
+        values: v
+      };
     }
-    ctx.sql[valuesPos] = getSqlText(toSQL(q2, { values: ctx.values }));
+    return { columns: newColumns, values: v };
   }
+  columns.forEach((column, i) => {
+    if (column in hookSet) {
+      const fromHook = {
+        fromHook: encodeValue(
+          ctx,
+          ctx.values,
+          q,
+          QueryClass,
+          hookSet[column],
+          quotedAs
+        )
+      };
+      for (const row of values) {
+        row[i] = fromHook;
+      }
+    }
+  });
+  const hookSetSql = addHookSetColumns.map(
+    (key) => encodeValue(
+      ctx,
+      ctx.values,
+      q,
+      QueryClass,
+      hookSet[key],
+      quotedAs
+    )
+  ).join(", ");
   return {
-    hookSelect: returning.hookSelect,
-    text: ctx.sql.join(" "),
-    values: ctx.values
+    hookSetSql,
+    columns: addHookSetColumns ? [...columns, ...addHookSetColumns] : columns,
+    values
   };
 };
 const mergeColumnsSql = (columns, quotedColumns, target, except) => {
@@ -6644,24 +6776,30 @@ const mergeColumnsSql = (columns, quotedColumns, target, except) => {
     `DO UPDATE SET ${quotedColumns[0]} = excluded.${quotedColumns[0]}`
   );
 };
-const encodeRow = (ctx, values, q, QueryClass, row, runtimeDefaults, quotedAs) => {
-  const arr = row.map((value) => {
-    if (value && typeof value === "object") {
-      if (value instanceof orchidCore.Expression) {
-        return value.toSQL(ctx, quotedAs);
-      } else if (value instanceof QueryClass) {
-        return `(${getSqlText(joinSubQuery(q, value).toSQL(ctx))})`;
-      }
-    }
-    return value === void 0 ? "DEFAULT" : orchidCore.addValue(values, value);
-  });
+const encodeRow = (ctx, values, q, QueryClass, row, runtimeDefaults, quotedAs, hookSetSql) => {
+  const arr = row.map(
+    (value) => encodeValue(ctx, values, q, QueryClass, value, quotedAs)
+  );
   if (runtimeDefaults) {
     for (const fn of runtimeDefaults) {
       arr.push(orchidCore.addValue(values, fn()));
     }
   }
+  if (hookSetSql) arr.push(hookSetSql);
   return arr.join(", ");
 };
+const encodeValue = (ctx, values, q, QueryClass, value, quotedAs) => {
+  if (value && typeof value === "object") {
+    if (value instanceof orchidCore.Expression) {
+      return value.toSQL(ctx, quotedAs);
+    } else if (value instanceof QueryClass) {
+      return `(${getSqlText(joinSubQuery(q, value).toSQL(ctx))})`;
+    } else if ("fromHook" in value) {
+      return value.fromHook;
+    }
+  }
+  return value === void 0 ? "DEFAULT" : orchidCore.addValue(values, value);
+};
 const hookSelectKeys = [
   null,
   "afterUpdateSelect",
@@ -7240,8 +7378,20 @@ const pushUpdateSql = (ctx, table, query, quotedAs) => {
     query.schema,
     table.table || query.from
   );
+  let hookSet;
+  if (query.hookUpdateSet) {
+    hookSet = {};
+    for (const item of query.hookUpdateSet) {
+      Object.assign(hookSet, item);
+    }
+  } else {
+    hookSet = orchidCore.emptyObject;
+  }
   const set = [];
-  processData(ctx, table, set, query.updateData, quotedAs);
+  processData(ctx, table, set, query.updateData, hookSet, quotedAs);
+  if (query.hookUpdateSet) {
+    applySet(ctx, table, set, hookSet, orchidCore.emptyObject, quotedAs);
+  }
   if (!set.length) {
     if (!query.select) {
       query.select = countSelect;
@@ -7281,32 +7431,35 @@ const pushUpdateReturning = (ctx, table, query, quotedAs, keyword) => {
   if (s) ctx.sql.push(keyword, s);
   return hookSelect;
 };
-const processData = (ctx, table, set, data, quotedAs) => {
+const processData = (ctx, table, set, data, hookSet, quotedAs) => {
   let append;
-  const QueryClass = ctx.qb.constructor;
   for (const item of data) {
     if (typeof item === "function") {
       const result = item(data);
       if (result) append = orchidCore.pushOrNewArray(append, result);
     } else {
-      const shape = table.q.shape;
-      for (const key in item) {
-        const value = item[key];
-        if (value === void 0) continue;
-        set.push(
-          `"${shape[key].data.name || key}" = ${processValue(
-            ctx,
-            table,
-            QueryClass,
-            key,
-            value,
-            quotedAs
-          )}`
-        );
-      }
+      applySet(ctx, table, set, item, hookSet, quotedAs);
     }
   }
-  if (append) processData(ctx, table, set, append, quotedAs);
+  if (append) processData(ctx, table, set, append, hookSet, quotedAs);
+};
+const applySet = (ctx, table, set, item, hookSet, quotedAs) => {
+  const QueryClass = ctx.qb.constructor;
+  const shape = table.q.shape;
+  for (const key in item) {
+    const value = item[key];
+    if (value === void 0 || key in hookSet) continue;
+    set.push(
+      `"${shape[key].data.name || key}" = ${processValue(
+        ctx,
+        table,
+        QueryClass,
+        key,
+        value,
+        quotedAs
+      )}`
+    );
+  }
 };
 const processValue = (ctx, table, QueryClass, key, value, quotedAs) => {
   if (value && typeof value === "object") {
@@ -8747,7 +8900,7 @@ const handleManyData = (q, data, ctx) => {
 const insert = (self, {
   columns,
   values
-}, kind, many) => {
+}, many) => {
   const { q } = self;
   if (!q.select?.length) {
     q.returning = true;
@@ -8758,7 +8911,6 @@ const insert = (self, {
   q.type = "insert";
   q.columns = columns;
   q.values = values;
-  if (!q.kind) q.kind = kind;
   const { select, returnType } = q;
   if (!select) {
     if (returnType !== "void") {
@@ -8806,9 +8958,8 @@ const insertFromQuery = (q, from, many, data) => {
     q,
     {
       columns,
-      values: { from, values: obj?.values }
+      values: { from, values: obj?.values[0] }
     },
-    "from",
     many
   );
 };
@@ -8822,10 +8973,10 @@ const _queryInsert = (q, data) => {
   const values = q.q.values;
   if (values && "from" in values) {
     obj.columns = getFromSelectColumns(values.from, obj);
-    values.values = obj.values;
+    values.values = obj.values[0];
     obj.values = values;
   }
-  return insert(q, obj, "object");
+  return insert(q, obj);
 };
 const _queryCreateMany = (q, data) => {
   createSelect(q);
@@ -8833,7 +8984,7 @@ const _queryCreateMany = (q, data) => {
 };
 const _queryInsertMany = (q, data) => {
   const ctx = createCtx();
-  let result = insert(q, handleManyData(q, data, ctx), "object", true);
+  let result = insert(q, handleManyData(q, data, ctx), true);
   if (!data.length) result = result.none();
   return result;
 };
@@ -9566,7 +9717,7 @@ const _queryHookAfterQuery = (q, cb) => {
   return pushQueryValueImmutable(q, "after", cb);
 };
 const _queryHookBeforeCreate = (q, cb) => {
-  return before(q, "Create", cb);
+  return before(q, "Create", (q2) => cb(new QueryHookUtils(q2, "hookCreateSet")));
 };
 const _queryHookAfterCreate = (q, select, cb) => {
   return after(q, "Create", select, cb);
@@ -9575,7 +9726,7 @@ const _queryHookAfterCreateCommit = (q, select, cb) => {
   return after(q, "Create", select, cb, true);
 };
 const _queryHookBeforeUpdate = (q, cb) => {
-  return before(q, "Update", cb);
+  return before(q, "Update", (q2) => cb(new QueryHookUtils(q2, "hookUpdateSet")));
 };
 const _queryHookAfterUpdate = (q, select, cb) => {
   return after(q, "Update", select, cb);
@@ -9584,7 +9735,11 @@ const _queryHookAfterUpdateCommit = (q, select, cb) => {
   return after(q, "Update", select, cb, true);
 };
 const _queryHookBeforeSave = (q, cb) => {
-  return before(before(q, "Create", cb), "Update", cb);
+  return before(
+    before(q, "Create", (q2) => cb(new QueryHookUtils(q2, "hookCreateSet"))),
+    "Update",
+    (q2) => cb(new QueryHookUtils(q2, "hookUpdateSet"))
+  );
 };
 const _queryHookAfterSave = (q, select, cb) => {
   return after(after(q, "Create", select, cb), "Update", select, cb);
@@ -9607,6 +9762,21 @@ const _queryHookAfterDelete = (q, select, cb) => {
 const _queryHookAfterDeleteCommit = (q, select, cb) => {
   return after(q, "Delete", select, cb, true);
 };
+class QueryHookUtils {
+  constructor(query, key) {
+    this.query = query;
+    this.key = key;
+    this.set = (data) => {
+      const set = {};
+      for (const key in data) {
+        if (data[key] !== void 0) {
+          set[key] = data[key];
+        }
+      }
+      pushQueryValueImmutable(this.query, this.key, set);
+    };
+  }
+}
 class QueryHooks {
   /**
    * Run the function before any kind of query.
@@ -11358,7 +11528,7 @@ function orCreate(query, data, updateData, mergeData) {
       q22.q.log = q2.q.log;
       q22.q.logger = q2.q.logger;
       q22.q.type = "upsert";
-      q22.q.beforeCreate = q2.q.beforeCreate;
+      q22.q.beforeCreate = q2.q.beforeCreate?.map((cb) => () => cb(c));
       if (hasAfterCallback) {
         ((_a = q22.q).afterCreate ?? (_a.afterCreate = [])).push(
           (data2, query2) => afterHooks && Promise.all([...afterHooks].map((fn) => fn(data2, query2)))
@@ -13357,6 +13527,7 @@ exports.PolygonColumn = PolygonColumn;
 exports.PostgisGeographyPointColumn = PostgisGeographyPointColumn;
 exports.QueryError = QueryError;
 exports.QueryGet = QueryGet;
+exports.QueryHookUtils = QueryHookUtils;
 exports.QueryHooks = QueryHooks;
 exports.QueryLog = QueryLog;
 exports.QueryMethods = QueryMethods;