orchid-orm 1.52.0 → 1.53.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { TableData, Query, SelectableFromShape, CreateMethodsNames, CreateData, CreateBelongsToData, AddQueryDefaults, RelationConfigBase, QueryTake, QueryTakeOptional, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromResult, AdapterOptions, DbSharedOptions, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, ComputedOptionsConfig, QueryOrExpression, QueryData, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
+import { TableData, Query, SelectableFromShape, CreateMethodsNames, CreateData, CreateBelongsToData, AddQueryDefaults, RelationConfigBase, QueryTake, QueryTakeOptional, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromResult, AdapterOptions, DbSharedOptions, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, ComputedOptionsConfig, QueryOrExpression, QueryData, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHookInternal, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
 import { ColumnsShapeBase, ColumnShapeInputPartial, EmptyObject, MaybeArray, AfterCommitStandaloneHook, RecordUnknown, ShallowSimplify, ColumnShapeOutput, DefaultSelectColumns, QueryColumn, ColumnShapeInput, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
 export * from 'orchid-core';
@@ -472,7 +472,7 @@ type Selectable<T extends ORMTableInput> = T['computed'] extends ((t: never) =>
 }> : ShallowSimplify<ColumnShapeOutput<T['columns']['shape']>>;
 type Insertable<T extends ORMTableInput> = ShallowSimplify<ColumnShapeInput<T['columns']['shape']>>;
 type Updatable<T extends ORMTableInput> = ShallowSimplify<ColumnShapeInputPartial<T['columns']['shape']>>;
-type BeforeHookMethod = (cb: QueryBeforeHook) => void;
+type BeforeHookMethod = (cb: QueryBeforeHookInternal) => void;
 type AfterHookMethod = (cb: QueryAfterHook) => void;
 type AfterSelectableHookMethod = <Shape extends QueryColumns, S extends (keyof Shape)[]>(this: {
     columns: {

package/dist/index.js

@@ -598,7 +598,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
       throw new Error("`upsert` option is not allowed in a batch update");
     }
     let idsForDelete;
-    pqb._queryHookBeforeUpdate(q, async (q2) => {
+    pqb._queryHookBeforeUpdate(q, async ({ query: q2 }) => {
       if (params.disconnect) {
         for (const key of foreignKeys) {
           update[key] = null;
@@ -854,7 +854,6 @@ const makeHasOneMethod = (tableConfig, table, relation, relationName, query) =>
         const baseQuery = query2.clone();
         baseQuery.q.select = fromQuerySelect;
         const q = relationQuery.q;
-        q.kind = "from";
         q.values = { from: baseQuery };
       };
     }
@@ -1132,7 +1131,6 @@ const makeHasManyMethod = (tableConfig, table, relation, relationName, query) =>
         const baseQuery = query2.clone();
         baseQuery.q.select = fromQuerySelect;
         const q = relationQuery.q;
-        q.kind = "from";
         q.values = { from: baseQuery };
       };
     }