orchid-orm 1.56.5 → 1.57.1

package/dist/index.d.ts

@@ -1,7 +1,8 @@
-import { TableData, Query, SelectableFromShape, CreateMethodsNames, CreateData, CreateBelongsToData, AddQueryDefaults, QueryTake, QueryTakeOptional, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, FromArg, FromResult, DbSharedOptions, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, ComputedOptionsConfig, QueryData, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHookInternal, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
+import { TableData, Query, SelectableFromShape, CreateData, CreateBelongsToData, AddQueryDefaults, QueryTake, QueryTakeOptional, UpdateData, WhereArg, CreateMethodsNames, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, FromArg, FromResult, DbSharedOptions, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, ComputedOptionsConfig, QueryData, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHookInternal, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
 import { ColumnsShapeBase, ColumnShapeInputPartial, RelationConfigBase, EmptyObject, MaybeArray, AfterCommitStandaloneHook, AdapterBase, RelationsBase, RecordUnknown, ShallowSimplify, ColumnShapeOutput, DefaultSelectColumns, QueryOrExpression, QueryColumn, ColumnShapeInput, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
 export * from 'orchid-core';
+import { CreateManyMethodsNames } from 'pqb/src/queryMethods/mutate/create';
 
 interface RelationRefsOptions<Column extends PropertyKey = string, Shape extends ColumnsShapeBase = ColumnsShapeBase> {
     required?: boolean;
@@ -27,20 +28,21 @@ type HasOneParams<T extends RelationConfigSelf, Relation extends RelationThunkBa
     [Name in Relation['options']['columns'][number]]: T['columns']['shape'][Name]['type'];
 } : Relation['options'] extends RelationThroughOptions ? RelationConfigParams<T, T['relations'][Relation['options']['through']]> : never;
 type HasOnePopulate<T extends RelationConfigSelf, Name extends string> = T['relations'][Name]['options'] extends RelationRefsOptions ? Record<T['relations'][Name]['options']['references'][number], true> : never;
-type HasOneQuery<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = T['relations'][Name]['options'] extends RelationThroughOptions ? {
+type HasOneQueryThrough<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = {
     [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         defaults: HasOnePopulate<T, Name>;
         hasWhere: true;
         selectable: SelectableFromShape<TableQuery['shape'], Name>;
     } : K extends 'join' ? RelJoin : K extends CreateMethodsNames ? never : TableQuery[K];
-} : {
+};
+type HasOneQuery<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = T['relations'][Name]['options'] extends RelationThroughOptions ? HasOneQueryThrough<T, Name, TableQuery> : {
     [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         defaults: HasOnePopulate<T, Name>;
         hasWhere: true;
         selectable: SelectableFromShape<TableQuery['shape'], Name>;
-    } : K extends 'join' ? RelJoin : TableQuery[K];
+    } : K extends 'join' ? RelJoin : K extends CreateManyMethodsNames ? never : TableQuery[K];
 };
 interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasOne, Q extends Query, CD = T['relations'][Name]['options'] extends RelationThroughOptions ? CreateData<Q, CreateBelongsToData<Q>> : CreateData<AddQueryDefaults<Q, HasOnePopulate<T, Name>>, CreateBelongsToData<Q>>> extends RelationConfigBase {
     returnsOne: true;
@@ -84,6 +86,14 @@ interface HasMany extends RelationThunkBase {
     type: 'hasMany';
     options: HasOneOptions;
 }
+type HasManyQuery<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = T['relations'][Name]['options'] extends RelationThroughOptions ? HasOneQueryThrough<T, Name, TableQuery> : {
+    [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
+        as: Name;
+        defaults: HasOnePopulate<T, Name>;
+        hasWhere: true;
+        selectable: SelectableFromShape<TableQuery['shape'], Name>;
+    } : K extends 'join' ? RelJoin : TableQuery[K];
+};
 interface HasManyInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasMany, Q extends Query> extends RelationConfigBase {
     returnsOne: false;
     query: Q;
@@ -443,7 +453,7 @@ interface TableToDb<T extends ORMTableInput, Relations extends RelationsBase> ex
     relations: Relations;
 }
 type ORMTableInputToQueryBuilder<T extends ORMTableInput> = T extends RelationConfigSelf ? TableToDb<T, T extends RelationConfigSelf ? {
-    [K in keyof T['relations'] & string]: T['relations'][K] extends BelongsTo ? BelongsToInfo<T, K, T['relations'][K], T['relations'][K]['options']['columns'][number] & string, T['relations'][K]['options']['required'], BelongsToQuery<RelationTableToQuery<T['relations'][K]>, K>> : T['relations'][K] extends HasOne ? HasOneInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationTableToQuery<T['relations'][K]>>> : T['relations'][K] extends HasMany ? HasManyInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationTableToQuery<T['relations'][K]>>> : T['relations'][K] extends HasAndBelongsToMany ? HasAndBelongsToManyInfo<T, K, T['relations'][K], HasAndBelongsToManyQuery<K, RelationTableToQuery<T['relations'][K]>>> : never;
+    [K in keyof T['relations'] & string]: T['relations'][K] extends BelongsTo ? BelongsToInfo<T, K, T['relations'][K], T['relations'][K]['options']['columns'][number] & string, T['relations'][K]['options']['required'], BelongsToQuery<RelationTableToQuery<T['relations'][K]>, K>> : T['relations'][K] extends HasOne ? HasOneInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationTableToQuery<T['relations'][K]>>> : T['relations'][K] extends HasMany ? HasManyInfo<T, K, T['relations'][K], HasManyQuery<T, K, RelationTableToQuery<T['relations'][K]>>> : T['relations'][K] extends HasAndBelongsToMany ? HasAndBelongsToManyInfo<T, K, T['relations'][K], HasAndBelongsToManyQuery<K, RelationTableToQuery<T['relations'][K]>>> : never;
 } : EmptyObject> : TableToDb<T, EmptyObject>;
 interface ORMTableInput {
     table: string;

package/dist/index.js

@@ -858,7 +858,8 @@ const makeHasOneMethod = (tableConfig, table, relation, relationName, query) =>
         const baseQuery = query2.clone();
         baseQuery.q.select = fromQuerySelect;
         const q = relationQuery.q;
-        q.values = { from: baseQuery };
+        q.insertFrom = baseQuery;
+        q.values = [];
       };
     }
   };
@@ -1135,7 +1136,8 @@ const makeHasManyMethod = (tableConfig, table, relation, relationName, query) =>
         const baseQuery = query2.clone();
         baseQuery.q.select = fromQuerySelect;
         const q = relationQuery.q;
-        q.values = { from: baseQuery };
+        q.insertFrom = baseQuery;
+        q.values = [];
       };
     }
   };
@@ -1531,19 +1533,16 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
         relationQuery,
         [],
         async (result) => {
-          if (result.length > 1) {
-            throw new orchidCore.OrchidOrmInternalError(
-              relationQuery,
-              "Creating multiple `hasAndBelongsToMany` records is not yet supported"
-            );
-          }
           const baseQuery2 = ref.q.clone();
           baseQuery2.q.select = selectPrimaryKeysAsForeignKeys;
-          const data = {};
-          for (let i = 0; i < throughLen; i++) {
-            data[throughForeignKeys[i]] = result[0][throughPrimaryKeys[i]];
-          }
-          const createdCount = await pqb._queryCreateFrom(
+          const data = result.map((resultRow) => {
+            const dataRow = {};
+            for (let i = 0; i < throughLen; i++) {
+              dataRow[throughForeignKeys[i]] = resultRow[throughPrimaryKeys[i]];
+            }
+            return dataRow;
+          });
+          const createdCount = await pqb._queryCreateManyFrom(
             subQuery.count(),
             baseQuery2,
             data
@@ -1819,7 +1818,7 @@ const nestedUpdate = (state) => {
         ...state.throughForeignKeys
       ];
       try {
-        const count = await state.joinTableQuery.insertManyFrom(
+        const count = await state.joinTableQuery.insertForEachFrom(
           pqb._querySelect(
             state.relatedTableQuery.whereOneOf(...relatedWheres),
             [