orchid-orm 1.55.0 → 1.56.2

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { TableData, Query, SelectableFromShape, CreateMethodsNames, CreateData, CreateBelongsToData, AddQueryDefaults, QueryTake, QueryTakeOptional, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromResult, AdapterOptions, 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, 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';
 export * from 'pqb';
-import { ColumnsShapeBase, ColumnShapeInputPartial, RelationConfigBase, EmptyObject, MaybeArray, AfterCommitStandaloneHook, RelationsBase, RecordUnknown, ShallowSimplify, ColumnShapeOutput, DefaultSelectColumns, QueryOrExpression, QueryColumn, ColumnShapeInput, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
+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';
 
 interface RelationRefsOptions<Column extends PropertyKey = string, Shape extends ColumnsShapeBase = ColumnsShapeBase> {
@@ -130,7 +130,13 @@ interface BelongsTo extends RelationThunkBase {
     type: 'belongsTo';
     options: BelongsToOptions;
 }
-type BelongsToOptions<Columns extends ColumnsShapeBase = ColumnsShapeBase, Related extends TableClass = TableClass> = RelationRefsOptions<keyof Columns, InstanceType<Related>['columns']['shape']>;
+interface BelongsToOptions<Columns extends ColumnsShapeBase = ColumnsShapeBase, Related extends TableClass = TableClass> {
+    required?: boolean;
+    columns: (keyof Columns)[];
+    references: (keyof InstanceType<Related>['columns']['shape'])[];
+    foreignKey?: boolean | TableData.References.Options;
+    on?: ColumnShapeInputPartial<InstanceType<Related>['columns']['shape']>;
+}
 type BelongsToFKey<Relation extends RelationThunkBase> = Relation['options'] extends RelationRefsOptions ? Relation['options']['columns'][number] : never;
 type BelongsToParams<T extends RelationConfigSelf, Relation extends BelongsTo> = {
     [Name in BelongsToFKey<Relation>]: T['columns']['shape'][Name]['type'];
@@ -225,7 +231,7 @@ type OrchidORM<T extends TableClasses = TableClasses> = {
      * @see import('pqb').Transaction.prototype.afterCommit
      */
     $afterCommit: typeof afterCommit;
-    $adapter: Adapter;
+    $adapter: AdapterBase;
     $qb: Db;
     /**
      * Use `$query` to perform raw SQL queries.
@@ -290,12 +296,12 @@ type OrchidORM<T extends TableClasses = TableClasses> = {
     $from<Arg extends MaybeArray<FromArg<Query>>>(arg: Arg): FromResult<FromQuery, Arg>;
     $close(): Promise<void>;
 };
-type OrchidOrmArg = true | null extends true ? 'Set strict: true to tsconfig' : ({
+type OrchidOrmParam<Options> = true | null extends true ? 'Set strict: true to tsconfig' : Options;
+declare const orchidORMWithAdapter: <T extends TableClasses>({ log, logger, autoPreparedStatements, noPrimaryKey, ...options }: OrchidOrmParam<({
     db: Query;
 } | {
-    adapter: Adapter;
-} | Omit<AdapterOptions, 'log'>) & DbSharedOptions;
-declare const orchidORM: <T extends TableClasses>({ log, logger, autoPreparedStatements, noPrimaryKey, ...options }: OrchidOrmArg, tables: T) => OrchidORM<T>;
+    adapter: AdapterBase;
+}) & DbSharedOptions>, tables: T) => OrchidORM<T>;
 
 interface HasAndBelongsToMany extends RelationThunkBase {
     type: 'hasAndBelongsToMany';
@@ -723,4 +729,4 @@ declare const createRepo: <T extends Query, Methods extends MethodsBase<T>>(tabl
     shape: T['shape'];
 }>(q: Q) => Query & Q & MapMethods<T, Methods>) & T, Methods>;
 
-export { type BaseTableClass, type BaseTableInstance, type DefaultSelect, type Insertable, type MapMethods, type MapQueryMethods, type MethodsBase, type ORMTableInput, type ORMTableInputToQueryBuilder, type OrchidORM, type Queryable, type Repo, type Selectable, type SetColumnsResult, type Table, type TableClass, type TableClasses, type TableInfo, type TableToDb, type Updatable, createBaseTable, createRepo, orchidORM };
+export { type BaseTableClass, type BaseTableInstance, type DefaultSelect, type Insertable, type MapMethods, type MapQueryMethods, type MethodsBase, type ORMTableInput, type ORMTableInputToQueryBuilder, type OrchidORM, type OrchidOrmParam, type Queryable, type Repo, type Selectable, type SetColumnsResult, type Table, type TableClass, type TableClasses, type TableInfo, type TableToDb, type Updatable, createBaseTable, createRepo, orchidORMWithAdapter };

package/dist/index.js

@@ -615,9 +615,10 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
           }
         }
         if (loadPrimaryKeys) {
-          const record = await pqb._queryFindBy(query.select(...loadPrimaryKeys), [
+          const record = await pqb._queryFindBy(
+            query.select(...loadPrimaryKeys),
             params.set
-          ]);
+          );
           for (let i = 0, len2 = loadPrimaryKeys.length; i < len2; i++) {
             update[loadForeignKeys[i]] = record[loadPrimaryKeys[i]];
           }
@@ -644,7 +645,9 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
       }
     });
     const { upsert } = params;
-    if (upsert || params.update || params.delete) ;
+    if (upsert || params.update || params.delete) {
+      selectIfNotSelected(q, foreignKeys);
+    }
     if (upsert) {
       (state.queries ?? (state.queries = [])).push(async (queryResult) => {
         const row = queryResult.rows[0];
@@ -1635,9 +1638,10 @@ const nestedInsert = ({
       for (const [, { connect }] of items) {
         for (const item of connect) {
           queries.push(
-            pqb._queryFindBy(t.select(...throughPrimaryKeys), [
+            pqb._queryFindBy(
+              t.select(...throughPrimaryKeys),
               item
-            ])
+            )
           );
         }
       }
@@ -1657,9 +1661,10 @@ const nestedInsert = ({
       for (const [, { connectOrCreate }] of items) {
         for (const item of connectOrCreate) {
           queries.push(
-            pqb._queryFindByOptional(t.select(...throughPrimaryKeys), [
+            pqb._queryFindByOptional(
+              t.select(...throughPrimaryKeys),
               item.where
-            ])
+            )
           );
         }
       }
@@ -2065,7 +2070,7 @@ function afterCommit(hook) {
   this.$qb.afterCommit(hook);
 }
 
-const orchidORM = ({
+const orchidORMWithAdapter = ({
   log,
   logger,
   autoPreparedStatements,
@@ -2086,7 +2091,7 @@ const orchidORM = ({
     transactionStorage = options.db.internal.transactionStorage;
     qb = options.db.qb;
   } else {
-    adapter = "adapter" in options ? options.adapter : new pqb.Adapter(options);
+    adapter = options.adapter;
     transactionStorage = new node_async_hooks.AsyncLocalStorage();
     qb = pqb._initQueryBuilder(
       adapter,
@@ -2197,7 +2202,7 @@ const createRepo = (table, methods) => {
 
 exports.createBaseTable = createBaseTable;
 exports.createRepo = createRepo;
-exports.orchidORM = orchidORM;
+exports.orchidORMWithAdapter = orchidORMWithAdapter;
 Object.keys(pqb).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,