orchid-orm 1.14.0 → 1.14.2

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { columnTypes, QueryHooks, getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSQLCacheKey, OrchidOrmInternalError, NotFoundError, relationQueryKey, Adapter, Db, anyShape, getClonedQueryData } from 'pqb';
+import { columnTypes, QueryHooks, getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSQLCacheKey, OrchidOrmInternalError, NotFoundError, Adapter, Db, anyShape, getClonedQueryData } from 'pqb';
 export { OrchidOrmError, OrchidOrmInternalError, columnTypes, raw, testTransaction } from 'pqb';
 import { getStackTrace, applyMixins, getCallerFilePath, snakeCaseKey, toSnakeCase } from 'orchid-core';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -177,8 +177,7 @@ const makeBelongsToMethod = (relation, relationName, query) => {
     },
     reverseJoin(fromQuery, toQuery) {
       return addQueryOn(fromQuery, toQuery, fromQuery, foreignKey, primaryKey);
-    },
-    primaryKey
+    }
   };
 };
 const nestedInsert$3 = ({ query, primaryKey }) => {
@@ -301,10 +300,12 @@ const nestedUpdate$3 = ({ query, primaryKey, foreignKey }) => {
 };
 
 const getThroughRelation = (table, through) => {
-  return table.relations[through];
+  var _a;
+  return (_a = table.relations[through]) == null ? void 0 : _a.relationConfig;
 };
 const getSourceRelation = (throughRelation, source) => {
-  return throughRelation.table.relations[source];
+  var _a;
+  return (_a = throughRelation.table.relations[source]) == null ? void 0 : _a.relationConfig;
 };
 const hasRelationHandleCreate = (q, ctx, item, rowIndex, key, primaryKey, nestedInsert) => {
   const value = item[key];
@@ -442,8 +443,7 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
             );
           }
         );
-      },
-      primaryKey: sourceRelation.primaryKey
+      }
     };
   }
   const { primaryKey, foreignKey } = relation.options;
@@ -462,7 +462,6 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
     reverseJoin(fromQuery, toQuery) {
       return addQueryOn(fromQuery, toQuery, fromQuery, primaryKey, foreignKey);
     },
-    primaryKey,
     modifyRelatedQuery(relationQuery) {
       return (query2) => {
         const fromQuery = query2.clone();
@@ -641,8 +640,7 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
             );
           }
         );
-      },
-      primaryKey: sourceRelation.primaryKey
+      }
     };
   }
   const { primaryKey, foreignKey } = relation.options;
@@ -661,7 +659,6 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
     reverseJoin(fromQuery, toQuery) {
       return addQueryOn(fromQuery, toQuery, fromQuery, primaryKey, foreignKey);
     },
-    primaryKey,
     modifyRelatedQuery(relationQuery) {
       return (query2) => {
         const fromQuery = query2.clone();
@@ -695,7 +692,9 @@ const nestedInsert$1 = ({ query, primaryKey, foreignKey }) => {
     if (connect.length) {
       await Promise.all(
         connect.flatMap(
-          ([selfData, { connect: connect2 }]) => t.or(...connect2)._updateOrThrow({ [foreignKey]: selfData[primaryKey] })
+          ([selfData, { connect: connect2 }]) => t.or(...connect2)._updateOrThrow({
+            [foreignKey]: selfData[primaryKey]
+          })
         )
       );
     }
@@ -913,7 +912,6 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
         (q) => q._on(associationForeignKeyFull, `${getQueryAs(toQuery)}.${apk}`)._on(foreignKeyFull, `${getQueryAs(fromQuery)}.${pk}`)
       );
     },
-    primaryKey: pk,
     modifyRelatedQuery(relationQuery) {
       const ref = {};
       relationQuery._afterCreate([], async (result) => {
@@ -1151,6 +1149,7 @@ var __spreadValues$2 = (a, b) => {
   return a;
 };
 const applyRelations = (qb, tables, result) => {
+  var _a;
   const tableEntries = Object.entries(tables);
   const delayedRelations = /* @__PURE__ */ new Map();
   for (const name in tables) {
@@ -1214,7 +1213,7 @@ const applyRelations = (qb, tables, result) => {
         let message = `Cannot define a \`${item.relationName}\` relation on \`${as}\``;
         const table = result[as];
         const { through, source } = relation.options;
-        const throughRel = table.relations[through];
+        const throughRel = (_a = table.relations[through]) == null ? void 0 : _a.relationConfig;
         if (through && !throughRel) {
           message += `: cannot find \`${through}\` relation required by the \`through\` option`;
         } else if (source && throughRel && !throughRel.table.relations[source]) {
@@ -1290,16 +1289,12 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
       return q;
     }
   };
-  dbTable.relations[relationName] = {
-    type,
-    key: relationName,
+  baseQuery.relationConfig = {
     table: otherDbTable,
     query,
-    joinQuery: data.joinQuery,
-    primaryKey: data.primaryKey,
-    options: relation.options
+    joinQuery: data.joinQuery
   };
-  dbTable.relationsQueries[relationName] = query;
+  dbTable.relations[relationName] = query;
   const tableRelations = delayedRelations.get(dbTable);
   if (!tableRelations)
     return;
@@ -1320,12 +1315,6 @@ const makeRelationQuery = (table, relationName, data, q) => {
       query.q.joinedShapes = __spreadValues$2({
         [getQueryAs(this)]: this.q.shape
       }, this.q.joinedShapes);
-      query.q[relationQueryKey] = {
-        relationName,
-        sourceQuery: this,
-        relationQuery: toTable,
-        joinQuery: data.joinQuery
-      };
       const setQuery = (_a = data.modifyRelatedQuery) == null ? void 0 : _a.call(data, query);
       setQuery == null ? void 0 : setQuery(this);
       return new Proxy(data.method, {