orchid-orm 1.54.1 → 1.55.1

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { makeColumnTypes, QueryHooks, defaultSchemaConfig, raw, getColumnTypes, parseTableData, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValueImmutable, pushQueryOnForOuter, cloneQueryBaseUnscoped, DynamicRawSQL, RawSQL, getShapeFromSelect, _queryWhere, _queryDefaults, getPrimaryKeys, VirtualColumn, _queryCreateMany, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryCreate, _queryRows, _queryUpdate, _queryDelete, _queryUpdateOrThrow, OrchidOrmInternalError, _queryJoinOn, _queryCreateFrom, NotFoundError, _queryFindByOptional, _querySelect, _queryWhereExists, _queryTake, _queryTakeOptional, Adapter, _initQueryBuilder, Db, getClonedQueryData } from 'pqb';
+import { makeColumnTypes, QueryHooks, defaultSchemaConfig, raw, getColumnTypes, parseTableData, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValueImmutable, pushQueryOnForOuter, cloneQueryBaseUnscoped, DynamicRawSQL, RawSQL, getShapeFromSelect, _queryWhere, _queryDefaults, VirtualColumn, _queryCreateMany, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryCreate, _queryRows, _queryUpdate, _queryDelete, _queryUpdateOrThrow, _queryJoinOn, _queryCreateFrom, _queryFindByOptional, _querySelect, _queryWhereExists, _queryTake, _queryTakeOptional, Adapter, _initQueryBuilder, Db, getClonedQueryData } from 'pqb';
 export * from 'pqb';
-import { getStackTrace, applyMixins, getCallerFilePath, snakeCaseKey, toSnakeCase, emptyObject, emptyArray, isExpression, pushQueryValueImmutable, toArray, objectHasValues, pick } from 'orchid-core';
+import { getStackTrace, applyMixins, getCallerFilePath, snakeCaseKey, toSnakeCase, emptyObject, emptyArray, isExpression, getPrimaryKeys, pushQueryValueImmutable, OrchidOrmInternalError, toArray, objectHasValues, NotFoundError, pick } from 'orchid-core';
 export * from 'orchid-core';
 import { AsyncLocalStorage } from 'node:async_hooks';
 
@@ -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;
   _queryHookAfterUpdate(q, primaryKeys, (rows, q2) => {
     return nestedUpdate(
@@ -637,6 +636,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
         const selectQuery = q2.clone();
         selectQuery.q.type = void 0;
         selectQuery.q.distinct = emptyArray;
+        selectIfNotSelected(selectQuery, foreignKeys);
         idsForDelete = await _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) {
-      _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);
+      _queryHookAfterUpdate(
+        q,
+        params.update ? foreignKeys : 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 _queryDelete(t);
+          } else {
+            await _queryUpdate(t, params.update);
           }
         }
-        if (!ids?.length) return;
-        const t = query.whereIn(
-          primaryKeys,
-          ids
-        );
-        if (params.delete) {
-          await _queryDelete(t);
-        } else {
-          await _queryUpdate(t, params.update);
-        }
-      });
+      );
     }
   };
 };
@@ -2157,6 +2158,8 @@ const orchidORM = ({
       Object.assign(result[key].baseQuery.q, table.q);
     }
   }
+  const db = result;
+  db.$adapter;
   return result;
 };