orchid-orm 1.54.1 → 1.55.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-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, 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, 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';
 export * from 'pqb';
-import { ColumnsShapeBase, ColumnShapeInputPartial, EmptyObject, MaybeArray, AfterCommitStandaloneHook, RecordUnknown, ShallowSimplify, ColumnShapeOutput, DefaultSelectColumns, QueryOrExpression, QueryColumn, ColumnShapeInput, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
+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';
 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'];

package/dist/index.js

@@ -183,7 +183,6 @@ const hasRelationHandleUpdate = (q, set, key, primaryKeys, nestedUpdate) => {
   const value = set[key];
   if (!value.set && !("upsert" in value) && (!value.add || Array.isArray(value.add) && value.add.length === 0) && (!value.disconnect || Array.isArray(value.disconnect) && value.disconnect.length === 0) && (!value.delete || Array.isArray(value.delete) && value.delete.length === 0) && (!value.update || Array.isArray(value.update.where) && value.update.where.length === 0) && (!value.create || Array.isArray(value.create) && value.create.length === 0))
     return;
-  selectIfNotSelected(q, primaryKeys);
   q.q.wrapInTransaction = true;
   pqb._queryHookAfterUpdate(q, primaryKeys, (rows, q2) => {
     return nestedUpdate(
@@ -506,7 +505,7 @@ const makeBelongsToMethod = (tableConfig, table, relation, relationName, query)
       state
     ),
     joinQuery: joinQueryChainHOF(
-      pqb.getPrimaryKeys(query),
+      orchidCore.getPrimaryKeys(query),
       reverseJoin,
       (joiningQuery, baseQuery) => join(
         baseQuery,
@@ -637,6 +636,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
         const selectQuery = q2.clone();
         selectQuery.q.type = void 0;
         selectQuery.q.distinct = orchidCore.emptyArray;
+        selectIfNotSelected(selectQuery, foreignKeys);
         idsForDelete = await pqb._queryRows(selectQuery);
         for (const foreignKey of foreignKeys) {
           update[foreignKey] = null;
@@ -644,9 +644,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
       }
     });
     const { upsert } = params;
-    if (upsert || params.update || params.delete) {
-      selectIfNotSelected(q, foreignKeys);
-    }
+    if (upsert || params.update || params.delete) ;
     if (upsert) {
       (state.queries ?? (state.queries = [])).push(async (queryResult) => {
         const row = queryResult.rows[0];
@@ -671,7 +669,6 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
           );
           const collectData = {};
           state.collect = {
-            keys: primaryKeys,
             data: collectData
           };
           for (let i = 0; i < len; i++) {
@@ -680,37 +677,41 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
         }
       });
     } else if (params.delete || params.update) {
-      pqb._queryHookAfterUpdate(q, [], async (data) => {
-        let ids;
-        if (params.delete) {
-          ids = idsForDelete;
-        } else {
-          ids = [];
-          for (const item of data) {
-            let row;
-            for (const foreignKey of foreignKeys) {
-              const id = item[foreignKey];
-              if (id === null) {
-                row = void 0;
-                break;
-              } else {
-                (row ?? (row = [])).push(id);
+      pqb._queryHookAfterUpdate(
+        q,
+        params.update ? foreignKeys : orchidCore.emptyArray,
+        async (data) => {
+          let ids;
+          if (params.delete) {
+            ids = idsForDelete;
+          } else {
+            ids = [];
+            for (const item of data) {
+              let row;
+              for (const foreignKey of foreignKeys) {
+                const id = item[foreignKey];
+                if (id === null) {
+                  row = void 0;
+                  break;
+                } else {
+                  (row ?? (row = [])).push(id);
+                }
               }
+              if (row) ids.push(row);
             }
-            if (row) ids.push(row);
+          }
+          if (!ids?.length) return;
+          const t = query.whereIn(
+            primaryKeys,
+            ids
+          );
+          if (params.delete) {
+            await pqb._queryDelete(t);
+          } else {
+            await pqb._queryUpdate(t, params.update);
           }
         }
-        if (!ids?.length) return;
-        const t = query.whereIn(
-          primaryKeys,
-          ids
-        );
-        if (params.delete) {
-          await pqb._queryDelete(t);
-        } else {
-          await pqb._queryUpdate(t, params.update);
-        }
-      });
+      );
     }
   };
 };
@@ -750,7 +751,7 @@ class HasOneVirtualColumn extends pqb.VirtualColumn {
   }
 }
 const makeHasOneMethod = (tableConfig, table, relation, relationName, query) => {
-  const relPKeys = pqb.getPrimaryKeys(query);
+  const relPKeys = orchidCore.getPrimaryKeys(query);
   if ("through" in relation.options) {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
@@ -1024,7 +1025,7 @@ class HasManyVirtualColumn extends pqb.VirtualColumn {
   }
 }
 const makeHasManyMethod = (tableConfig, table, relation, relationName, query) => {
-  const relPKeys = pqb.getPrimaryKeys(query);
+  const relPKeys = orchidCore.getPrimaryKeys(query);
   if ("through" in relation.options) {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
@@ -1262,7 +1263,7 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
     }
     if (params.add) {
       if (data.length > 1) {
-        throw new pqb.OrchidOrmInternalError(
+        throw new orchidCore.OrchidOrmInternalError(
           query,
           "`connect` is not available when updating multiple records, it is only applicable for a single record update"
         );
@@ -1277,7 +1278,7 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
         obj
       );
       if (count < relatedWheres.length) {
-        throw new pqb.OrchidOrmInternalError(
+        throw new orchidCore.OrchidOrmInternalError(
           query,
           `Expected to find at least ${relatedWheres.length} record(s) based on \`add\` conditions, but found ${count}`
         );
@@ -1508,7 +1509,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
       state
     ),
     joinQuery: joinQueryChainHOF(
-      pqb.getPrimaryKeys(query),
+      orchidCore.getPrimaryKeys(query),
       reverseJoin,
       (joiningQuery, baseQuery2) => joinQuery(
         joiningQuery,
@@ -1528,7 +1529,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
         [],
         async (result) => {
           if (result.length > 1) {
-            throw new pqb.OrchidOrmInternalError(
+            throw new orchidCore.OrchidOrmInternalError(
               relationQuery,
               "Creating multiple `hasAndBelongsToMany` records is not yet supported"
             );
@@ -1545,7 +1546,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
             data
           );
           if (createdCount === 0) {
-            throw new pqb.NotFoundError(baseQuery2);
+            throw new orchidCore.NotFoundError(baseQuery2);
           }
         }
       );
@@ -1840,14 +1841,14 @@ const nestedUpdate = (state) => {
           )
         ).onConflict(joinTableColumns).merge([state.foreignKeys[0]]);
         if (count < data.length * relatedWheres.length) {
-          throw new pqb.OrchidOrmInternalError(
+          throw new orchidCore.OrchidOrmInternalError(
             query,
             `Expected to find at least ${relatedWheres.length} record(s) based on \`add\` conditions, but found ${count / data.length}`
           );
         }
       } catch (err) {
         if (err.code === "42P10") {
-          throw new pqb.OrchidOrmInternalError(
+          throw new orchidCore.OrchidOrmInternalError(
             query,
             `"${state.joinTableQuery.table}" must have a primary key or a unique index on columns (${joinTableColumns.join(
               ", "
@@ -2157,6 +2158,8 @@ const orchidORM = ({
       Object.assign(result[key].baseQuery.q, table.q);
     }
   }
+  const db = result;
+  db.$adapter;
   return result;
 };