orchid-orm 1.55.1 → 1.56.2

package/dist/index.mjs

@@ -1,4 +1,4 @@
-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';
+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, _initQueryBuilder, Db, getClonedQueryData } from 'pqb';
 export * from 'pqb';
 import { getStackTrace, applyMixins, getCallerFilePath, snakeCaseKey, toSnakeCase, emptyObject, emptyArray, isExpression, getPrimaryKeys, pushQueryValueImmutable, OrchidOrmInternalError, toArray, objectHasValues, NotFoundError, pick } from 'orchid-core';
 export * from 'orchid-core';
@@ -615,9 +615,10 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
           }
         }
         if (loadPrimaryKeys) {
-          const record = await _queryFindBy(query.select(...loadPrimaryKeys), [
+          const record = await _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(
-            _queryFindBy(t.select(...throughPrimaryKeys), [
+            _queryFindBy(
+              t.select(...throughPrimaryKeys),
               item
-            ])
+            )
           );
         }
       }
@@ -1657,9 +1661,10 @@ const nestedInsert = ({
       for (const [, { connectOrCreate }] of items) {
         for (const item of connectOrCreate) {
           queries.push(
-            _queryFindByOptional(t.select(...throughPrimaryKeys), [
+            _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 Adapter(options);
+    adapter = options.adapter;
     transactionStorage = new AsyncLocalStorage();
     qb = _initQueryBuilder(
       adapter,
@@ -2195,5 +2200,5 @@ const createRepo = (table, methods) => {
   });
 };
 
-export { createBaseTable, createRepo, orchidORM };
+export { createBaseTable, createRepo, orchidORMWithAdapter };
 //# sourceMappingURL=index.mjs.map