orchid-orm 1.58.10 → 1.59.1

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, pushQueryValueImmutable, _queryCreateMany, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryCreate, _queryRows, _queryUpdate, _queryDelete, _queryUpdateOrThrow, 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';
 
@@ -401,45 +401,48 @@ class BelongsToVirtualColumn extends VirtualColumn {
     super(schema);
     this.key = key;
     this.state = state;
-    this.nestedInsert = nestedInsert$3(this.state);
     this.nestedUpdate = nestedUpdate$3(this.state);
   }
-  create(q, ctx, item, rowIndex) {
+  create(q, ctx, item) {
     const {
       key,
-      state: { primaryKeys, foreignKeys }
+      state: { query, primaryKeys, foreignKeys }
     } = this;
-    const columnIndexes = foreignKeys.map((key2) => {
-      let index = ctx.columns.get(key2);
-      if (index === void 0) {
-        ctx.columns.set(key2, index = ctx.columns.size);
+    for (const key2 of foreignKeys) {
+      if (!ctx.columns.has(key2)) {
+        ctx.columns.set(key2, ctx.columns.size);
       }
-      return index;
-    });
-    const store = ctx;
-    if (!store.belongsTo) store.belongsTo = {};
-    const values = [rowIndex, columnIndexes, item[key]];
-    if (store.belongsTo[key]) {
-      store.belongsTo[key].push(values);
-      return;
     }
-    const relationData = [values];
-    store.belongsTo[key] = relationData;
-    q.q.wrapInTransaction = true;
-    pushQueryValueImmutable(q, "beforeCreate", async (q2) => {
-      const inserted = await this.nestedInsert(
-        q2,
-        relationData.map(([, , data]) => data)
+    const value = item[key];
+    if ("create" in value || "connectOrCreate" in value) {
+      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}")`;
+          });
+        },
+        "create" in value ? _queryCreate(selectPKeys, value.create) : _orCreate(
+          _queryWhere(selectPKeys, [
+            value.connectOrCreate.where
+          ]),
+          value.connectOrCreate.create
+        )
       );
-      const { values: values2 } = q2.q;
-      for (let i = 0, len = relationData.length; i < len; i++) {
-        const [rowIndex2, columnIndexes2] = relationData[i];
-        const row = values2[rowIndex2];
-        for (let c = 0, len2 = columnIndexes2.length; c < len2; c++) {
-          row[columnIndexes2[c]] = inserted[i][primaryKeys[c]];
-        }
-      }
-    });
+      return;
+    } else if ("connect" in value) {
+      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
+        );
+      });
+      return;
+    }
   }
   update(q, ctx, set) {
     q.q.wrapInTransaction = true;
@@ -515,80 +518,6 @@ const makeBelongsToMethod = (tableConfig, table, relation, relationName, query)
     reverseJoin
   };
 };
-const nestedInsert$3 = ({ query, primaryKeys, on }) => {
-  return async (_, data) => {
-    const t = query.clone();
-    const items = [];
-    for (const item of data) {
-      if (item.connectOrCreate) {
-        items.push(
-          on ? {
-            ...item,
-            connectOrCreate: {
-              ...item.connectOrCreate,
-              where: { ...item.connectOrCreate.where, ...on }
-            }
-          } : item
-        );
-      }
-    }
-    let connectOrCreated;
-    if (items.length) {
-      for (let i = 0, len = items.length; i < len; i++) {
-        items[i] = t.findByOptional(
-          items[i].connectOrCreate.where
-        );
-      }
-      connectOrCreated = await Promise.all(items);
-    } else {
-      connectOrCreated = emptyArray;
-    }
-    let connectOrCreatedI = 0;
-    items.length = 0;
-    for (const item of data) {
-      if (item.connectOrCreate) {
-        if (!connectOrCreated[connectOrCreatedI++]) items.push(item);
-      } else if (item.create) {
-        items.push(item);
-      }
-    }
-    let created;
-    if (items.length) {
-      for (let i = 0, len = items.length; i < len; i++) {
-        items[i] = "create" in items[i] ? items[i].create : items[i].connectOrCreate.create;
-      }
-      created = await _queryCreateMany(
-        t.select(...primaryKeys),
-        items
-      );
-    } else {
-      created = emptyArray;
-    }
-    items.length = 0;
-    for (const item of data) {
-      if (item.connect) {
-        items.push(
-          on ? { ...item, connect: { ...item.connect, ...on } } : item
-        );
-      }
-    }
-    let connected;
-    if (items.length) {
-      for (let i = 0, len = items.length; i < len; i++) {
-        items[i] = t.findBy(items[i].connect);
-      }
-      connected = await Promise.all(items);
-    } else {
-      connected = emptyArray;
-    }
-    let createdI = 0;
-    let connectedI = 0;
-    connectOrCreatedI = 0;
-    return data.map((item) => {
-      return item.connectOrCreate ? connectOrCreated[connectOrCreatedI++] || created[createdI++] : item.connect ? connected[connectedI++] : created[createdI++];
-    });
-  };
-};
 const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
   return (q, update, params, state) => {
     if (params.upsert && isQueryReturnsAll(q)) {
@@ -856,7 +785,7 @@ const makeHasOneMethod = (tableConfig, table, relation, relationName, query) =>
         const baseQuery = query2.clone();
         baseQuery.q.select = fromQuerySelect;
         const q = relationQuery.q;
-        q.insertFrom = baseQuery;
+        q.insertFrom = prepareSubQueryForSql(q, baseQuery);
         q.values = [];
       };
     }
@@ -1134,7 +1063,7 @@ const makeHasManyMethod = (tableConfig, table, relation, relationName, query) =>
         const baseQuery = query2.clone();
         baseQuery.q.select = fromQuerySelect;
         const q = relationQuery.q;
-        q.insertFrom = baseQuery;
+        q.insertFrom = prepareSubQueryForSql(q, baseQuery);
         q.values = [];
       };
     }
@@ -1406,7 +1335,9 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
   const primaryKeysShape = {};
   for (let i = 0; i < len; i++) {
     const pk = primaryKeys[i];
-    shape[foreignKeys[i]] = removeColumnName(table.shape[pk]);
+    shape[foreignKeys[i]] = removeColumnName(
+      table.shape[pk]
+    );
     primaryKeysShape[pk] = table.shape[pk];
   }
   for (let i = 0; i < throughLen; i++) {