orchid-orm 1.59.2 → 1.59.4

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { makeColumnTypes, getStackTrace, applyMixins, QueryHooks, defaultSchemaConfig, raw, getCallerFilePath, snakeCaseKey, getColumnTypes, parseTableData, toSnakeCase, emptyObject, emptyArray, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValueImmutable, pushQueryOnForOuter, isExpression, cloneQueryBaseUnscoped, DynamicRawSQL, RawSQL, getShapeFromSelect, _queryWhere, _queryDefaults, getPrimaryKeys, VirtualColumn, _with, _queryCreate, _orCreate, getFreeAlias, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryRows, _queryUpdate, _queryDelete, prepareSubQueryForSql, _queryUpdateOrThrow, _queryCreateMany, OrchidOrmInternalError, toArray, objectHasValues, _queryJoinOn, _queryCreateManyFrom, NotFoundError, _queryFindByOptional, _querySelect, pick, _queryWhereExists, _queryTake, _queryTakeOptional, _initQueryBuilder, Db, getClonedQueryData } from 'pqb';
+import { makeColumnTypes, getStackTrace, applyMixins, QueryHooks, defaultSchemaConfig, raw, getCallerFilePath, snakeCaseKey, getColumnTypes, parseTableData, toSnakeCase, emptyObject, emptyArray, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValueImmutable, pushQueryOnForOuter, isExpression, cloneQueryBaseUnscoped, DynamicRawSQL, RawSql, getShapeFromSelect, _queryWhere, _queryDefaults, getPrimaryKeys, VirtualColumn, _with, _queryCreate, _orCreate, getFreeAlias, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryRows, _queryUpdate, _queryDelete, prepareSubQueryForSql, _queryUpdateOrThrow, _queryCreateMany, OrchidOrmInternalError, toArray, objectHasValues, _queryJoinOn, _queryCreateManyFrom, NotFoundError, _queryFindByOptional, _querySelect, pick, _queryWhereExists, _queryTake, _queryTakeOptional, _initQueryBuilder, Db, getClonedQueryData } from 'pqb';
 export * from 'pqb';
 import { AsyncLocalStorage } from 'node:async_hooks';
 
@@ -387,7 +387,7 @@ const combineOrdering = (result, joined) => {
 const wrapQuery = (joiningQuery, result, item) => {
   const baseOuterQuery = cloneQueryBaseUnscoped(joiningQuery);
   const outer = baseOuterQuery.clone();
-  outer.q.and = [new DynamicRawSQL(() => new RawSQL(`${item.as || "r"} = 1`))];
+  outer.q.and = [new DynamicRawSQL(() => new RawSql(`${item.as || "r"} = 1`))];
   outer.q.useFromLimitOffset = true;
   outer.shape = getShapeFromSelect(result, true);
   outer.q.select = Object.keys(outer.shape);
@@ -415,13 +415,16 @@ class BelongsToVirtualColumn extends VirtualColumn {
     }
     const value = item[key];
     if ("create" in value || "connectOrCreate" in value) {
-      foreignKeys.forEach((foreignKey) => item[foreignKey] = new RawSQL(""));
+      foreignKeys.forEach((foreignKey) => item[foreignKey] = new RawSql(""));
       const selectPKeys = query.select(...primaryKeys);
       _with(
         q,
         (as) => {
           foreignKeys.forEach((foreignKey, i) => {
-            item[foreignKey]._sql = `(SELECT "${as}"."${primaryKeys[i]}" FROM "${as}")`;
+            item[foreignKey]._sql = selectCteColumnSql(
+              as,
+              primaryKeys[i]
+            );
           });
         },
         "create" in value ? _queryCreate(selectPKeys, value.create) : _orCreate(
@@ -436,9 +439,8 @@ class BelongsToVirtualColumn extends VirtualColumn {
       const as = getFreeAlias(q.q.withShapes, "q");
       _with(q, as, query.select(...primaryKeys).findBy(value.connect));
       foreignKeys.map((foreignKey, i) => {
-        const selectColumn = `(SELECT "${as}"."${primaryKeys[i]}" FROM "${as}")`;
-        item[foreignKey] = new RawSQL(
-          i === 0 ? `CASE WHEN (SELECT count(*) FROM "${as}") = 0 AND (SELECT 'not-found')::int = 0 THEN NULL ELSE ${selectColumn} END` : selectColumn
+        item[foreignKey] = new RawSql(
+          selectCteColumnMustExistSql(i, as, primaryKeys[i])
         );
       });
       return;
@@ -542,13 +544,18 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
           }
         }
         if (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]];
+            update[loadForeignKeys[i]] = new RawSql("");
           }
+          _with(
+            q2,
+            (as) => {
+              for (let i = 0, len2 = loadPrimaryKeys.length; i < len2; i++) {
+                update[loadForeignKeys[i]]._sql = selectCteColumnMustExistSql(i, as, loadPrimaryKeys[i]);
+              }
+            },
+            _queryFindBy(query.select(...loadPrimaryKeys), params.set)
+          );
         }
       } else if (params.create) {
         const q3 = query.clone();
@@ -645,6 +652,11 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
     }
   };
 };
+const selectCteColumnSql = (cteAs, column) => `(SELECT "${cteAs}"."${column}" FROM "${cteAs}")`;
+const selectCteColumnMustExistSql = (i, cteAs, column) => {
+  const selectColumn = selectCteColumnSql(cteAs, column);
+  return i === 0 ? `CASE WHEN (SELECT count(*) FROM "${cteAs}") = 0 AND (SELECT 'not-found')::int = 0 THEN NULL ELSE ${selectColumn} END` : selectColumn;
+};
 
 class HasOneVirtualColumn extends VirtualColumn {
   constructor(schema, key, state) {